Changeset 637

Timestamp:

08/03/2007 02:32:50 PM (3 years ago)

Author:

JavaWoman

Message:

• implemented StaticHref() for the comment display buttons
• removed redundant span
• prevented NOTICE by initializing a variable
• removed comment about templating class
• a little coding style cleanup

refs #496

Files:

• trunk/handlers/show/show.php (modified) (6 diffs)

trunk/handlers/show/show.php

@@ -118 +118 @@
                                 $comments = $this->LoadComments($this->tag, $_SESSION['show_comments'][$tag]);
                                 $display_mode = $_SESSION['show_comments'][$tag];
+                                // set up icons
+                                $sort_desc_icon_url = StaticHref('images/icons/sort_desc.gif');
+                                $sort_ascc_icon_url = StaticHref('images/icons/sort_asc.gif');
+                                $sort_comment_icon_url = StaticHref('images/icons/comment.gif');
+
 
                                 // display comments header
@@ -124 +129 @@
                                 <div class="commentsheader">
                                         <div id="commentsnav">
-                                                <a href="<?php echo $this->Href('', '', 'show_comments='.COMMENT_ORDER_DATE_DESC.'#comments') ?>"><?php echo '<img class="'.($display_mode==COMMENT_ORDER_DATE_DESC ?  "icon_on" : "icon").'" alt="flat" title="Flat (newest first)" src="images/icons/sort_desc.gif" />' ?></a>
-                                                <a href="<?php echo $this->Href('', '', 'show_comments='.COMMENT_ORDER_DATE_ASC.'#comments') ?>"><?php echo '<img class="'.($display_mode==COMMENT_ORDER_DATE_ASC ?  "icon_on" : "icon").'" alt="flat" title="Flat (oldest first)" src="images/icons/sort_asc.gif" />' ?></a>
-                                                <a href="<?php echo $this->Href('', '', 'show_comments='.COMMENT_ORDER_THREADED.'#comments') ?>"><?php echo '<img class="'.($display_mode==COMMENT_ORDER_THREADED ?  "icon_on" : "icon").'" alt="threaded" title="Threaded" src="images/icons/comment.gif" />' ?></a> 
+                                                <a href="<?php echo $this->Href('', '', 'show_comments='.COMMENT_ORDER_DATE_DESC.'#comments') ?>"><?php echo '<img class="'.($display_mode==COMMENT_ORDER_DATE_DESC ?  "icon_on" : "icon").'" alt="flat" title="Flat (newest first)" src="'.$sort_desc_icon_url.'" />' ?></a>
+                                                <a href="<?php echo $this->Href('', '', 'show_comments='.COMMENT_ORDER_DATE_ASC.'#comments') ?>"><?php echo '<img class="'.($display_mode==COMMENT_ORDER_DATE_ASC ?  "icon_on" : "icon").'" alt="flat" title="Flat (oldest first)" src="'.$sort_asc_icon_url.'" />' ?></a>
+                                                <a href="<?php echo $this->Href('', '', 'show_comments='.COMMENT_ORDER_THREADED.'#comments') ?>"><?php echo '<img class="'.($display_mode==COMMENT_ORDER_THREADED ?  "icon_on" : "icon").'" alt="threaded" title="Threaded" src="'.$sort_comment_icon_url.'" />' ?></a> 
                                         </div><!-- closing commentsnav div -->
-                                <!--<span id="comments">&nbsp;</span>--><?php echo COMMENTS_CAPTION ?><?php // TODO what is this span for?? ?>
+                                <?php echo COMMENTS_CAPTION ?>
                                 [<a href="<?php echo $this->Href('', '', 'show_comments='.COMMENT_NO_DISPLAY) ?>"><?php echo HIDE_COMMENTS_LINK_DESC ?></a>]
 <?php
@@ -152 +157 @@
                         {
 
+                                $showcomments_text = '';        // FIXES notice
                                 echo '<!--starting comments header (hide)-->'."\n";
                                 echo '<div class="commentsheader">'."\n";
@@ -172 +178 @@
                                         default:
                                                 $comments_message = sprintf(STATUS_SOME_COMMENTS, $commentCount).' ';
-                                                $comment_ordering = null;
+                                                $comment_ordering = NULL;
                                                 if (isset($user['default_comment_display']))
                                                 {
@@ -190 +196 @@
                                 echo $comments_message;
                                 echo $showcomments_text;
-                                echo "\n".'</div><!--closing commentsheader (hide)-->'."\n"; //TODO: move to templating class
+                                echo "\n".'</div><!--closing commentsheader (hide)-->'."\n";
                         }
                         echo '</div><!--closing comments block-->'."\n\n";
@@ -263 +269 @@
                         if ($obj->HasAccess('comment_post'))
                         {
-                                echo "<div class=\"commentaction\">";
+                                echo '<div class="commentaction">';
                                 echo $obj->FormOpen("processcomment");
 ?>