X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;ds=sidebyside;f=templates%2Fdefault%2Fmessage_list.tpl;h=e946bac70671a0de7a0e5e8ad90f804c96bb8d67;hb=a4cca6e24bd1fefe1ee5d6c212b47335c10c9618;hp=6b2b3972641114f417b1de84061bb003d2bee93c;hpb=42ad60c03da7c072d612841c82f6f5c893e02783;p=squirrelmail.git

diff --git a/templates/default/message_list.tpl b/templates/default/message_list.tpl
index 6b2b3972..e946bac7 100644
--- a/templates/default/message_list.tpl
+++ b/templates/default/message_list.tpl
@@ -62,6 +62,8 @@
  *    $show_label_columns
  *    $compact_paginator
  *    $aErrors
+ *    $checkall
+ *    $preselected
  *
  * @copyright © 1999-2006 The SquirrelMail Project Team
  * @license http://opensource.org/licenses/gpl-license.php GNU Public License
@@ -105,13 +107,6 @@ if ($pageOffset < $end_msg) {
  */
 
 
-// set this to an empty string to turn off extra
-// highlighting of checked rows
-//
-//$clickedColor = '';
-$clickedColor = (empty($color[16])) ? $color[2] : $color[16];
-
-
 ?>
 <div id="message_list">
 <form id="<?php echo $form_name;?>" name="<?php echo $form_name;?>" method="post" action="<?php echo $php_self;?>">
@@ -133,7 +128,9 @@ $clickedColor = (empty($color[16])) ? $color[2] : $color[16];
                        */
                       $paginator_str = $this->fetch('paginator.tpl');
                       echo $paginator_str . '<small>[<a href="' . $thread_link_uri
-                                          . '">' . $thread_name . '</a>]</small>'; ?>
+                                          . '">' . $thread_name . '</a>]</small>&nbsp;&nbsp;';
+                      if (!empty($plugin_output['mailbox_paginator_after'])) echo $plugin_output['mailbox_paginator_after'];
+                  ?>
 <!-- end paginator and thread link string -->
               </td>
 <!-- message count string -->
@@ -196,34 +193,36 @@ $clickedColor = (empty($color[16])) ? $color[2] : $color[16];
         switch ($iCol) {
           case SQM_COL_CHECK:
               if ($javascript_on) {
-                  echo '<input type="checkbox" name="toggleAll" title="'._("Toggle All").'" onclick="toggle_all(\''.$form_name."',".$fancy_index_highlite.')" />'."\n";
+                  $checked = ($checkall ? ' checked="checked" ' : '');
+                  echo '<input type="checkbox" name="toggleAll" id="toggleAll" title="'._("Toggle All").'" onclick="toggle_all(\''.$form_name."',".$fancy_index_highlite.')" ' . $checked . '/>'."\n";
               } else {
-                  $link = $baseurl . "&amp;startMessage=$pageOffset&amp;checkall=";
-                  if (sqgetGlobalVar('checkall',$checkall,SQ_GET)) {
-                      $link .= ($checkall) ? '0' : '1';
-                  } else {
-                      $link .= '1';
-                  }
+                  $link = $baseurl 
+                        . "&amp;startMessage=$pageOffset&amp;checkall=" 
+                        . ($checkall ? '0' : '1');
                   echo "<a href=\"$link\">"._("All").'</a>';
               }
               break;
-          case SQM_COL_FROM:       echo _("From")."\n";     break;
-          case SQM_COL_DATE:       echo _("Date")."\n";     break;
-          case SQM_COL_SUBJ:       echo _("Subject")."\n";  break;
+          case SQM_COL_FROM:       
+              echo '<label for="toggleAll">' . _("From") . "</label>\n";
+              break;
+          case SQM_COL_DATE:       echo _("Date") . "\n";     break;
+          case SQM_COL_SUBJ:       echo _("Subject") . "\n";  break;
           case SQM_COL_FLAGS:
                 echo getIcon($icon_theme_path, 'msg_new.png', '&nbsp;', _("Message Flags")) . "\n";
                 break;
-          case SQM_COL_SIZE:       echo  _("Size")."\n";    break;
+          case SQM_COL_SIZE:       echo  _("Size") . "\n";    break;
           case SQM_COL_PRIO:
                 echo getIcon($icon_theme_path, 'prio_high.png', '!', _("Priority")) . "\n";
                 break;
           case SQM_COL_ATTACHMENT:
                 echo getIcon($icon_theme_path, 'attach.png', '+', _("Attachment")) . "\n";
                 break;
-          case SQM_COL_INT_DATE:   echo _("Received")."\n"; break;
-          case SQM_COL_TO:         echo _("To")."\n";       break;
-          case SQM_COL_CC:         echo _("Cc")."\n";       break;
-          case SQM_COL_BCC:        echo _("Bcc")."\n";      break;
+          case SQM_COL_INT_DATE:   echo _("Received") . "\n"; break;
+          case SQM_COL_TO:
+              echo '<label for="toggleAll">' . _("To") . "</label>\n";
+              break;
+          case SQM_COL_CC:         echo _("Cc") . "\n";       break;
+          case SQM_COL_BCC:        echo _("Bcc") . "\n";      break;
           default: break;
         }
         // add the sort buttons
@@ -265,9 +264,7 @@ $clickedColor = (empty($color[16])) ? $color[2] : $color[16];
             // this stuff does the auto row highlighting on mouseover
             //
             if ($javascript_on && $fancy_index_highlite) {
-                $mouseoverColor = $color[5];
                 $checkbox_javascript = ' onclick="this.checked = !this.checked;"';
-                // $clickedColor is defined at top of this file
             } else {
                 $checkbox_javascript = '';
             }
@@ -315,29 +312,48 @@ $clickedColor = (empty($color[16])) ? $color[2] : $color[16];
         $aColumns[SQM_COL_ATTACHMENT]['value'] = $sValue;
     }
 
-	$class = 'even';
+    $class = (($checkall || in_array($iUid, $preselected)) && $javascript_on && $fancy_index_highlite ? 'clicked_even' : 'even');
+    $non_clicked_class = 'even';
+
     /**
      * If alternating row colors is set, adapt the CSS class
      */
     if (isset($alt_index_colors) && $alt_index_colors) {
         if (!($i % 2)) {
-        	$class = 'odd';
+            $class = (($checkall || in_array($iUid, $preselected)) && $javascript_on && $fancy_index_highlite ? 'clicked_odd' : 'odd');
+            $non_clicked_class = 'odd';
         }
 
     }
+
+    /**
+     * Message Highlighting Functionality
+     */
     if (isset($aMsg['row']['color']))
     {
-    	$bgcolor = $aMsg['row']['color'];
-    	$class = 'misc'.$i;
+    	if (($checkall || in_array($iUid, $preselected)) && $javascript_on && $fancy_index_highlite) {
+//FIXME: would be best not to use $color directly here; want to move this to be a CSS style-defined value only, but the problem is that this CSS class is being defined on the fly right here
+    	    $bgcolor = $color[16];
+    	    $class = 'clicked_misc'.$i;
+        } else {
+            $bgcolor = $aMsg['row']['color'];
+    	    $class = 'misc'.$i;
+        }
+        $non_clicked_class = 'misc'.$i;
+        $non_clicked_bgcolor = $aMsg['row']['color'];
+    } 
+    else 
+    {
+        $bgcolor = '';
+        $non_clicked_bgcolor = '';
     }
-    else $bgcolor = '';
 
     $row_extra = '';
 
     // this stuff does the auto row highlighting on mouseover
     //
     if ($javascript_on && $fancy_index_highlite) {
-        $row_extra = ' onmouseover="rowOver(\''.$form_id . '_msg' . $i.'\');" onmouseout="setPointer(this, ' . $i . ', \'out\', \'' . $class . '\', \'mouse_over\', \'clicked\');" onmousedown="setPointer(this, ' . $i . ', \'click\', \'' . $class . '\', \'mouse_over\', \'clicked\');"';
+        $row_extra = ' onmouseover="rowOver(\''.$form_id . '_msg' . $i.'\');" onmouseout="setPointer(this, ' . $i . ', \'out\', \'' . $non_clicked_class . '\', \'mouse_over\', \'clicked\');" onmousedown="setPointer(this, ' . $i . ', \'click\', \'' . $non_clicked_class . '\', \'mouse_over\', \'clicked\');"';
     }
     // this does the auto-checking of the checkbox no matter
     // where on the row you click
@@ -345,15 +361,17 @@ $clickedColor = (empty($color[16])) ? $color[2] : $color[16];
     $javascript_auto_click = '';
     if ($javascript_on && $fancy_index_highlite) {
         // include the form_id in order to show multiple messages lists. Otherwise id isn't unique
-        $javascript_auto_click = " onmousedown=\"row_click('$form_id"."_msg$i')\"";
+        $javascript_auto_click = " onmousedown=\"row_click('$form_id"."_msg$i', event)\"";
     }
 
+
 /*
  * Message Highlighting requires a unique CSS class declaration for proper
  * mouseover functionality.  There is no harm in doing this when the mouseover
  * functionality is disabled
  */
-if ($class != 'even' && $class != 'odd')
+if ($class != 'even' && $class != 'odd' 
+ && $class != 'clicked_even' && $class != 'clicked_odd')
 {
 ?>
 <style type="text/css">
@@ -363,6 +381,19 @@ if ($class != 'even' && $class != 'odd')
 </style>
 <?php
 }
+if ($non_clicked_class != 'even' && $non_clicked_class != 'odd' 
+ && $non_clicked_class != 'clicked_even' && $non_clicked_class != 'clicked_odd')
+{
+?>
+<style type="text/css">
+<!--
+.table_messageList	tr.<?php echo $non_clicked_class; ?>	{ background:<?php echo $non_clicked_bgcolor; ?> }
+-->
+</style>
+<?php
+}
+
+
 ?>
 <tr <?php echo (empty($class) ? '' : 'class="'.$class.'" ');  echo $row_extra;?>>
 <?php
@@ -408,13 +439,13 @@ if ($class != 'even' && $class != 'odd')
 
         switch ($iCol) {
           case SQM_COL_CHECK:
+            $checked = (($checkall || in_array($iUid, $preselected)) ? ' checked="checked" ' : '');
             if ($javascript_on) {
                 echo '<td class="col_check"'. $javascript_auto_click. '>' ?>
-                <input type="checkbox" name="<?php echo "msg[$i]";?>" id="<?php echo $form_id."_msg$i";?>" value="<?php echo $iUid;?>" <?php echo $checkbox_javascript;?> /></td>
+                <input type="checkbox" name="<?php echo "msg[$i]";?>" id="<?php echo $form_id."_msg$i";?>" value="<?php echo $iUid;?>" <?php echo $checkbox_javascript . $checked;?> /></td>
             <?php
             } else {
                 echo '<td class="col_check">';
-                $checked = ($checkall) ? ' checked=checked ' : '';
                 echo "<input type=\"checkbox\" name=\"msg[".$i."]\" id=\"".$form_id."_msg$i\" value=\"$iUid\" $checked/></td>";
             }
             break;
@@ -430,9 +461,8 @@ if ($class != 'even' && $class != 'odd')
             if ($onclick)    { $sText .= " onclick=\"$onclick\""; }
             if ($link_extra) { $sText .= " $link_extra";          }
             if ($javascript_on && $fancy_index_highlite) {
-                  $sText .= " onmousedown=\"row_click('$form_id"."_msg$i'); setPointer(this." . (empty($bold) ? '' : 'parentNode.') .
-                            'parentNode.parentNode, ' . $i . ', \'click\', \''. $class. '\', \'mouse_over\', \'' .
-                             $clickedColor .'\');"';
+                  $sText .= " onmousedown=\"row_click('$form_id"."_msg$i', event); setPointer(this." . (empty($bold) ? '' : 'parentNode.') .
+                            'parentNode.parentNode, ' . $i . ', \'click\', \''. $non_clicked_class. '\', \'mouse_over\', \'clicked\');"';
             }
             $sText .= ">"
                    . $value . '</a>';
@@ -504,6 +534,7 @@ if ($class != 'even' && $class != 'odd')
                        */
                       $paginator_str = $this->fetch('paginator.tpl');
                       echo $paginator_str; 
+                      if (!empty($plugin_output['mailbox_paginator_after'])) echo $plugin_output['mailbox_paginator_after'];
                     ?></td>
                     <td class="message_count"><?php echo $msg_cnt_str; ?></td>
                   </tr>
@@ -523,5 +554,5 @@ if ($class != 'even' && $class != 'odd')
 </div>
 
 <?php if (!$hide_sm_attributions): ?>
-<p class="sqm_squirrelcopyright">&copy; 1999-2007 The SquirrelMail Project Team - <a href="about.php">About SquirrelMail</a></p>
+<p class="sqm_squirrelcopyright">&copy; <?php echo SM_COPYRIGHT ?> The SquirrelMail Project Team - <a href="about.php">About SquirrelMail</a></p>
 <?php endif; ?>