UI organizing

[squirrelmail.git] / functions / mailbox_display.php

diff --git a/functions/mailbox_display.php b/functions/mailbox_display.php
index c0ff48043302d601405018a8a727cf23059f2d6c..f2aa0164ed50ea6e7bd40ecbd9564833d042862e 100644 (file)
--- a/functions/mailbox_display.php
+++ b/functions/mailbox_display.php
@@ -374,9 +374,9 @@
 
       $Message = '';
       if ($startMessage < $endMessage) {
-         $Message = _("Viewing messages") .":<B>$startMessage</B> ". _("to") ." <B>$endMessage</B> ($numMessages " . _("total") . ")\n";
+         $Message = sprintf( _("Viewing Messages: <B>%s</B> to <B>%s</B> (%s total)"), $startMessage, $endMessage, $numMessages );
       } elseif ($startMessage == $endMessage) {
-         $Message = _("Viewing message") .":<B>$startMessage</B> ($numMessages " . _("total") . ")\n";
+         $Message = sprintf( _("Viewing Message: <B>%s</B> to <B>%s</B> (%s total)"), $startMessage, $endMessage, $numMessages );
       }
 
       if ($sort == 6) {
@@ -488,7 +488,13 @@
          } while ($i && $i < $endVar);
       }
 
-      echo "<TR BGCOLOR=\"$color[5]\"><TD colspan=5><table width=100%><tr ><td>$lMore$mMore$rMore</td><td align=right>$Message</td></tr></table></td></tr></table>";
+      echo '</table>';
+      echo "<table bgcolor=\"$color[9]\" width=100% border=0 cellpadding=1 cellspacing=1>" .
+              "<tr BGCOLOR=\"$color[4]\">" .
+                 "<table width=100% BGCOLOR=\"$color[4]\" border=0 cellpadding=1 cellspacing=0><tr><td>$lMore$mMore$rMore</td>".
+                 "<td align=right>$Message</td></tr></table>".
+              "</tr>".
+           "</table>";
       /** End of message-list table */
 
       do_hook('mailbox_index_after');
@@ -511,9 +517,10 @@
       $urlMailbox = urlencode($mailbox);
 
       /** This is the beginning of the message list table.  It wraps around all messages */
-      echo '<TABLE WIDTH="100%" BORDER="0" CELLPADDING="2" CELLSPACING="0">';
+      echo "<center>$Message</center>" .
+           '<TABLE WIDTH="100%" BORDER="0" CELLPADDING="1" CELLSPACING="0">';
 
-      echo "<TR BGCOLOR=\"$color[4]\"><TD>";
+      echo "<TR BGCOLOR=\"$color[9]\"><TD>";
 
       echo  "<table bgcolor=\"$color[4]\" cellpadding=2".
            ' width="100%" cellpadding="0" cellspacing="0" border="0"><tr><td>' .
@@ -522,7 +529,7 @@
       echo "</td></tr></table>\n</td></tr>";
 
       /** The delete and move options */
-      echo "<TR><TD BGCOLOR=\"$color[0]\">";
+      echo "<TD BGCOLOR=\"$color[0]\">";
 
       echo "\n<FORM name=messageList method=post action=\"$moveURL\">\n";
       echo "<TABLE BGCOLOR=\"$color[0]\" COLS=2 BORDER=0 cellpadding=0 cellspacing=0 width=100%>\n";
@@ -543,7 +550,7 @@
       for ($i = 0; $i < count($boxes); $i++) {
          if (!in_array("noselect", $boxes[$i]['flags'])) {
             $box = $boxes[$i]['unformatted'];
-            $box2 = str_replace(' ', '&nbsp;', $boxes[$i]['unformatted-disp']);
+            $box2 = str_replace(' ', '&nbsp;', $boxes[$i]['formatted']);
             echo "         <OPTION VALUE=\"$box\">$box2</option>\n";
          }
       }
@@ -639,22 +646,18 @@
    function ShowSelectAllLink($startMessage, $sort) {
        global $checkall, $PHP_SELF, $what, $where, $mailbox;
 
-       ?>&nbsp;
-<script language="JavaScript">
-<!--
-function CheckAll() {
-  for (var i = 0; i < document.messageList.elements.length; i++) {
-    if( document.messageList.elements[i].type == 'checkbox' ) {
-      document.messageList.elements[i].checked =
-        !(document.messageList.elements[i].checked);
-    }
-  }
-}
-window.document.write('<a href=# onClick="CheckAll();"><?php echo
- _("Toggle All") ?></a>');
-//-->
-</script><noscript>
-<?PHP
+       echo '&nbsp;<script language="JavaScript">' .
+            "\n<!-- \n" .
+            "function CheckAll() {\n" .
+            "   for (var i = 0; i < document.messageList.elements.length; i++) {\n" .
+            "       if( document.messageList.elements[i].type == 'checkbox' ) {\n" .
+            "           document.messageList.elements[i].checked = !(document.messageList.elements[i].checked);\n".
+            "       }\n" .
+            "   }\n" .
+            "}\n" .
+            'window.document.write(\'<a href=# onClick="CheckAll();">' . _("Toggle All") . "</a>');\n" .
+            "//-->\n" .
+            "</script>\n<noscript>\n";
 
        echo "<a href=\"$PHP_SELF?mailbox=" . urlencode($mailbox) .
           "&startMessage=$startMessage&sort=$sort&checkall=";