Lots of little UI tweaks and some handsome borders in the Options and Folder areas.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@1363 7612ce4b-ef26-0410-bec9-ea0150e637f0

diff --git a/functions/page_header.php b/functions/page_header.php
index 9dc2a5c2c277c6c1f783088841d4bd91477251f6..6b6663edb6df6eab77bb48d85a2d55faca4b00c7 100644 (file)
--- a/functions/page_header.php
+++ b/functions/page_header.php
@@ -75,7 +75,7 @@
       echo "</TABLE>\n\n";
       echo "<TABLE BGCOLOR=\"$color[4]\" BORDER=0 WIDTH=\"100%\" CELLSPACING=0 CELLPADDING=2>\n";
       echo "   <TR>\n";
-      echo "      <TD ALIGN=left WIDTH=\"99%\">\n";
+      echo "      <TD ALIGN=left WIDTH=\"90%\">\n";
       $urlMailbox = urlencode($mailbox);
       displayInternalLink ("src/compose.php?mailbox=$urlMailbox", _("Compose"), "right");
       echo "&nbsp;&nbsp;\n";
@@ -92,7 +92,7 @@
 
       do_hook("menuline");
 
-      echo "      </TD><TD ALIGN=right nowrap WIDTH=\"1%\">\n";
+      echo "      </TD><TD ALIGN=right nowrap WIDTH=\"10%\">\n";
       echo "         <A HREF=\"http://www.squirrelmail.org/\" TARGET=\"_blank\">SquirrelMail</A>\n";
       echo "      </TD>\n";
       echo "   </TR>\n";

diff --git a/src/compose.php b/src/compose.php
index 19d831367eca158ff89b7169338b39b6c4758b27..b1a922152eb0334d896c47ad2957ea400efddc12 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -222,9 +222,9 @@
       if ($idents != '' && $idents > 1)
       {
          echo "   <TR>\n";
-         echo "      <TD BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
+         echo "      <TD BGCOLOR=\"$color[4]\" WIDTH=\"10%\" ALIGN=RIGHT>\n";
          echo _("From:");
-         echo "      </TD><TD BGCOLOR=\"$color[4]\">\n";
+         echo "      </TD><TD BGCOLOR=\"$color[4]\" WIDTH=\"90%\">\n";
         echo "<select name=identity>\n";
         echo "<option value=default>" . 
            htmlspecialchars(getPref($data_dir, $username, 'full_name'));
@@ -247,9 +247,9 @@
          echo "   </TR>\n";
       }
       echo "   <TR>\n";
-      echo "      <TD BGCOLOR=\"$color[4]\" ALIGN=RIGHT>\n";
+      echo "      <TD BGCOLOR=\"$color[4]\" WIDTH=\"10%\" ALIGN=RIGHT>\n";
       echo _("To:");
-      echo "      </TD><TD BGCOLOR=\"$color[4]\">\n";
+      echo "      </TD><TD BGCOLOR=\"$color[4]\" WIDTH=\"90%\">\n";
       printf("         <INPUT TYPE=text NAME=\"send_to\" VALUE=\"%s\" SIZE=60><BR>\n",
              htmlspecialchars($send_to));
       echo "      </TD>\n";

diff --git a/src/folders.php b/src/folders.php
index 95d938cb4b51157d041293ceae19e246ed6d7164..a1f2f426634a09129821278a6aee5dac206488c0 100644 (file)
--- a/src/folders.php
+++ b/src/folders.php
@@ -21,18 +21,26 @@
 
    displayPageHeader($color, _("None"));
 
-   echo "<br>";
-   echo "<TABLE WIDTH=95% COLS=1 ALIGN=CENTER>\n";
-   echo "   <TR><TD BGCOLOR=\"$color[0]\" ALIGN=CENTER><b>\n";
-   echo _("Folders");
-   echo "   </b></TD></TR>\n";
-   echo "</TABLE>\n";
+?>
+
+<div align="center">
+
+<br>
+<table bgcolor="<?php echo $color[0] ?>" width="95%" align="center" cellpadding="2" cellspacing="0" border="0">
+<tr><td align="center">
+
+      <b><?php echo _("Folders"); ?></b>
+
+    <table width="100%" border="0" cellpadding="5" cellspacing="0">
+    <tr><td bgcolor="<?php echo $color[4] ?>" align="center">
+
+<?php
 
    if ((isset($success) && $success) || 
        (isset($sent_create) && $sent_create == "true") || 
        (isset($trash_create) && $trash_create == "true")) {
-      echo "<table width=100% align=center cellpadding=3 cellspacing=0 border=0>\n";
-      echo "   <tr><td><center>\n";
+      echo "<table width=100% align=center cellpadding=2 cellspacing=0 border=0>\n";
+      echo "   <tr><td align=center>\n";
       if ($success == "subscribe") {
          echo "<b>" . _("Subscribed successfully!") . "</b><br>";
       } else if ($success == "unsubscribe") {
@@ -56,7 +64,7 @@
       }
 
       echo "   <a href=\"../src/left_main.php\" target=left>" . _("refresh folder list") . "</a>";
-      echo "   </center></td></tr>\n";
+      echo "   </td></tr>\n";
       echo "</table><br>\n";
    }
    $imapConnection = sqimap_login ($username, $key, $imapServerAddress, $imapPort, 0);
@@ -169,9 +177,9 @@
          }
       }
    }
-   echo "</SELECT></TT><BR>\n";
+   echo "</SELECT></TT>\n";
    if ($show_contain_subfolders_option) {
-      echo "<INPUT TYPE=CHECKBOX NAME=\"contain_subs\"> &nbsp;";
+      echo "<br><INPUT TYPE=CHECKBOX NAME=\"contain_subs\"> &nbsp;";
       echo _("Let this folder contain subfolders");
       echo "<BR>";
    }   
@@ -214,11 +222,11 @@
    echo "<tr><td bgcolor=\"$color[4]\">&nbsp;</td></tr></table>\n";
    
    /** UNSUBSCRIBE FOLDERS **/
-   echo "<TABLE WIDTH=70% COLS=1 ALIGN=CENTER cellpadding=2 cellspacing=0 border=0>\n";
-   echo "<TR><TD BGCOLOR=\"$color[9]\" ALIGN=CENTER colspan=3><B>";
+   echo "<TABLE WIDTH=70% COLS=2 ALIGN=CENTER cellpadding=2 cellspacing=1 border=0>\n";
+   echo "<TR><TD BGCOLOR=\"$color[9]\" ALIGN=CENTER colspan=2><B>";
    echo _("Unsubscribe") . "/" . _("Subscribe");
-   echo "</B></TD></TR>";
-   echo "<TR><TD BGCOLOR=\"$color[0]\" width=49% ALIGN=CENTER>";
+   echo "</B></TD></TR>\n";
+   echo "<TR><TD BGCOLOR=\"$color[0]\" width=50% ALIGN=CENTER>\n";
    if ($count_special_folders < count($boxes)) {
       echo "<FORM ACTION=\"folders_subscribe.php?method=unsub\" METHOD=\"POST\">\n";
       echo "<TT><SELECT NAME=mailbox[] multiple size=8>\n";
@@ -243,10 +251,8 @@
    }
    $boxes_sub = $boxes;
 
-   echo "<td bgcolor=\"$color[9]\" width=2%>&nbsp;</td>";
-   
    /** SUBSCRIBE TO FOLDERS **/
-   echo "<TD BGCOLOR=\"$color[0]\" widtn=49% ALIGN=CENTER>";
+   echo "<TD BGCOLOR=\"$color[0]\" widtn=50% ALIGN=CENTER>";
    $imap_stream = sqimap_login ($username, $key, $imapServerAddress, $imapPort, 1);
    $boxes_all = sqimap_mailbox_list_all ($imap_stream);
 
@@ -283,8 +289,21 @@
    } else {
       echo _("No folders were found to subscribe to!") . "</td></tr></table>";
    }
+?>
+
+
+  <?php do_hook("folders_bottom"); ?>
+
 
-   do_hook("folders_bottom");
+    </td></tr>
+    </table>
+
+</td></tr>
+</table>
+
+<?php
    sqimap_logout($imapConnection);
 ?>
-</BODY></HTML>
+
+</div>
+</body></html>

diff --git a/src/options.php b/src/options.php
index f78d285b1418ac032120b8f3f8025f05d6ed01e4..1dd0b6429c51b2aa273493fd4eba72291732a1f9 100644 (file)
--- a/src/options.php
+++ b/src/options.php
@@ -23,15 +23,20 @@
    }   
 
    include('../src/load_prefs.php');
-   displayPageHeader($color, 'None');
+   displayPageHeader($color, _("None"));
 
 ?>
 
+<div align="center">
+
 <br>
-<table width="95%" align="center" cellpadding="2" cellspacing="2" border="0">
-<tr><td bgcolor="<?php echo $color[0] ?>">
-   <center><b><?php echo _("Options") ?></b></center>
-</td></tr></table>
+<table bgcolor="<?php echo $color[0] ?>" width="95%" align="center" cellpadding="2" cellspacing="0" border="0">
+<tr><td align="center">
+
+      <b><?php echo _("Options") ?></b><br>
+
+    <table width="100%" border="0" cellpadding="5" cellspacing="0">
+    <tr><td bgcolor="<?php echo $color[4] ?>" align="center">
 
 <?php
    if (isset($submit_personal)) {
@@ -52,7 +57,7 @@
       
       do_hook('options_personal_save');
       
-      echo '<br><center><b>'._("Successfully saved personal information!").'</b></center><br>';
+      echo '<br><b>'._("Successfully saved personal information!").'</b><br>';
    } else if (isset($submit_display)) {
       // Do checking to make sure $chosentheme is in the array
       $in_ary = false;
@@ -89,8 +94,8 @@
     
       do_hook('options_display_save');
 
-      echo '<br><center><b>'._("Successfully saved display preferences!").'</b><br>';
-      echo '<a href="../src/webmail.php?right_frame=options.php" target=_top>' . _("Refresh Page") . '</a></center><br>';
+      echo '<br><b>'._("Successfully saved display preferences!").'</b><br>';
+      echo '<a href="../src/webmail.php?right_frame=options.php" target=_top>' . _("Refresh Page") . '</a><br>';
    } else if (isset($submit_folder)) { 
       # Save folder preferences
       if ($trash != 'none') {
@@ -115,16 +120,15 @@
       else
           removePref($data_dir, $username, 'collapse_folders');
       do_hook('options_folders_save');
-      echo '<br><center><b>'._("Successfully saved folder preferences!").'</b><br>';
-      echo '<a href="../src/left_main.php" target=left>' . _("Refresh Folder List") . '</a></center><br>';
+      echo '<br><b>'._("Successfully saved folder preferences!").'</b><br>';
+      echo '<a href="../src/left_main.php" target=left>' . _("Refresh Folder List") . '</a><br>';
    } else {
       do_hook('options_save');
    }
    
 ?>
 
-
-<table width="90%" cellpadding="0" cellspacing="10" border="0" align="center">
+<table bgcolor="<?php echo $color[4] ?>" width="100%" cellpadding="5" cellspacing="0" border="0">
 <tr>
    <td width="50%" valign="top">
       <table width="100%" cellpadding="3" cellspacing="0" border="0">
@@ -192,7 +196,16 @@
    </td>
 </tr>
 </table>
-   <?php
-      do_hook('options_link_and_description')
-   ?>
+
+   <?php do_hook('options_link_and_description'); ?>
+
+
+    </td></tr>
+    </table>
+
+</td></tr>
+</table>
+
+
+</div>
 </body></html>

diff --git a/src/options_display.php b/src/options_display.php
index a8ea08526f5bd61d3788c73ffded497d9819011a..7c5e34ce1f616341d8c8188bf6c4d3e0e5f89a60 100644 (file)
--- a/src/options_display.php
+++ b/src/options_display.php
@@ -22,12 +22,16 @@
    $chosen_language = getPref($data_dir, $username, 'language');  
 ?>
    <br>
-   <table width="95%" align="center" border="0" cellpadding="2" cellspacing="0"><tr><td bgcolor="<?php echo $color[0] ?>">
-      <center><b><?php echo _("Options") . ' - ' . _("Display Preferences"); ?></b></center>
-   </td></tr></table>
+<table width="95%" align="center" border="0" cellpadding="2" cellspacing="0">
+<tr><td bgcolor="<?php echo $color[0] ?>" align="center">
 
-   <form name="f" action="options.php" method="post">
-      <table width="100%" cellpadding="0" cellspacing="2" border="0">
+      <b><?php echo _("Options") . ' - ' . _("Display Preferences"); ?></b><br>
+
+    <table width="100%" border="0" cellpadding="1" cellspacing="1">
+    <tr><td bgcolor="<?php echo $color[4] ?>" align="center">
+
+   <form name="f" action="options.php" method="post"><br>
+      <table width="100%" cellpadding="2" cellspacing="0" border="0">
          <tr>
             <td align="right" nowrap><?php echo _("Theme"); ?>:
             </td><td>
@@ -164,80 +168,25 @@
    else
       echo '                  <OPTION VALUE="None">'.$none_str;
  
-   if (($left_refresh == 10))
-      echo '                  <OPTION VALUE="10" SELECTED>10 '.$seconds_str;
-   else
-      echo '                  <OPTION VALUE="10">10 '.$seconds_str;
- 
-   if (($left_refresh == 20))
-      echo '                  <OPTION VALUE="20" SELECTED>20 '.$seconds_str;
-   else
-      echo '                  <OPTION VALUE="20">20 '.$seconds_str;
- 
-   if (($left_refresh == 30))
-      echo '                  <OPTION VALUE="30" SELECTED>30 '.$seconds_str;
-   else
-      echo '                  <OPTION VALUE="30">30 '.$seconds_str;
- 
-   if (($left_refresh == 60))
-      echo '                  <OPTION VALUE="60" SELECTED>1 '.$minute_str;
-   else
-      echo '                  <OPTION VALUE="60">1 '.$minute_str;
- 
-   if (($left_refresh == 120))
-      echo '                  <OPTION VALUE="120" SELECTED>2 '.$minutes_str;
-   else
-      echo '                  <OPTION VALUE="120">2 '.$minutes_str;
- 
-   if (($left_refresh == 180))
-      echo '                  <OPTION VALUE="180" SELECTED>3 '.$minutes_str;
-   else
-      echo '                  <OPTION VALUE="180">3 '.$minutes_str;
- 
-   if (($left_refresh == 240))
-      echo '                  <OPTION VALUE="240" SELECTED>4 '.$minutes_str;
-   else
-      echo '                  <OPTION VALUE="240">4 '.$minutes_str;
- 
-   if (($left_refresh == 300))
+   if (($left_refresh <= 300))
       echo '                  <OPTION VALUE="300" SELECTED>5 '.$minutes_str;
    else
       echo '                  <OPTION VALUE="300">5 '.$minutes_str;
  
-   if (($left_refresh == 420))
-      echo '                  <OPTION VALUE="420" SELECTED>7 '.$minutes_str;
-   else
-      echo '                  <OPTION VALUE="420">7 '.$minutes_str;
-
-   if (($left_refresh == 600))
-      echo '                  <OPTION VALUE="600" SELECTED>10 '.$minutes_str;
-   else
-      echo '                  <OPTION VALUE="600">10 '.$minutes_str;
- 
    if (($left_refresh == 720))
       echo '                  <OPTION VALUE="720" SELECTED>12 '.$minutes_str;
    else
       echo '                  <OPTION VALUE="720">12 '.$minutes_str;
  
-   if (($left_refresh == 900))
-      echo '                  <OPTION VALUE="900" SELECTED>15 '.$minutes_str;
-   else
-      echo '                  <OPTION VALUE="900">15 '.$minutes_str;
- 
    if (($left_refresh == 1200))
       echo '                  <OPTION VALUE="1200" SELECTED>20 '.$minutes_str;
    else
       echo '                  <OPTION VALUE="1200">20 '.$minutes_str;
  
-   if (($left_refresh == 1500))
-      echo '                  <OPTION VALUE="1500" SELECTED>25 '.$minutes_str;
-   else
-      echo'                  <OPTION VALUE="1500">25 '.$minutes_str;
- 
-   if (($left_refresh == 1800))
-      echo '                  <OPTION VALUE="1800" SELECTED>30 '.$minutes_str;
+   if (($left_refresh == 3600))
+      echo '                  <OPTION VALUE="3600" SELECTED>60 '.$minutes_str;
    else
-      echo '                  <OPTION VALUE="1800">30 '.$minutes_str;
+      echo '                  <OPTION VALUE="3600">60 '.$minutes_str;
  
       echo '               </SELECT>'; 
 ?>
@@ -280,7 +229,14 @@ echo _("Yes, show me the HTML version of a mail message, if it is available.");
                <input type="submit" value="<?php echo _("Submit"); ?>"name="submit_display">
             </td>
          </tr>
-      </table>   
+      </table>
    </form>
+
    <?php do_hook('options_display_bottom'); ?>
+
+    </td></tr>
+    </table>
+
+</td></tr>
+</table>
 </body></html>

diff --git a/src/options_folder.php b/src/options_folder.php
index 2b62364e9e696c87e354413e62b333642f650fbb..139a85f10ba2790e53bdd4dcbfe9680aeb3e41cc 100644 (file)
--- a/src/options_folder.php
+++ b/src/options_folder.php
@@ -25,12 +25,17 @@
    sqimap_logout($imapConnection);
 ?>
    <br>
-   <table width="95%" align="center" border="0" cellpadding="2" cellspacing="0"><tr><td bgcolor="<?php echo $color[0] ?>">
-      <center><b><?php echo _("Options") . " - " . _("Folder Preferences"); ?></b></center>
-   </td></tr></table>
+<table width="95%" align="center" border="0" cellpadding="2" cellspacing="0">
+<tr><td bgcolor="<?php echo $color[0] ?>" align="center">
 
-   <form name="f" action="options.php" method="post">
-      <table width="100%" cellpadding="0" cellspacing="5" border="0">
+      <b><?php echo _("Options") . " - " . _("Folder Preferences"); ?></b>
+
+    <table width="100%" border="0" cellpadding="1" cellspacing="1">
+    <tr><td bgcolor="<?php echo $color[4] ?>" align="center">
+
+   <form name="f" action="options.php" method="post"><br>
+
+      <table width="100%" cellpadding="2" cellspacing="0" border="0">
 
 <?php if ($show_prefix_option == true) {   ?>   
          <tr>
@@ -137,5 +142,12 @@
          </tr>
       </table>
    </form>
+
    <?php do_hook('options_folders_bottom'); ?>
+
+    </td></tr>
+    </table>
+
+</td></tr>
+</table>
 </body></html>

diff --git a/src/options_highlight.php b/src/options_highlight.php
index c2aa0864aece610918a8e2fca7690b8c7095171a..7d96320c707fa2f2d5fb5b9e5eaee53783d7d85e 100644 (file)
--- a/src/options_highlight.php
+++ b/src/options_highlight.php
@@ -51,10 +51,13 @@
    displayPageHeader($color, 'None');
 ?>
    <br>
-   <table width="95%" align="center" border="0" cellpadding="2" cellspacing="0"><tr><td bgcolor="<?php echo $color[0] ?>">
-      <center><b><?php echo _("Options") . ' - ' . _("Message Highlighting"); ?></b></center>
-   </td></tr></table>
+   <table width="95%" align="center" border="0" cellpadding="2" cellspacing="0">
+   <tr><td bgcolor="<?php echo $color[0] ?>" align="center">
 
+      <b><?php echo _("Options") . ' - ' . _("Message Highlighting"); ?></b>
+
+      <table width="100%" cellpadding="1" cellspacing="1" border="0">
+      <tr><td bgcolor="<?php echo $color[4] ?>" align="center">
 <?php
    echo '<br><center>[<a href="options_highlight.php?action=add">' . _("New") . '</a>]';
    echo ' - [<a href="options.php">'._("Done").'</a>]</center><br>'."\n";
@@ -76,7 +79,7 @@
       echo "</table>\n";
       echo "<br>\n";
    } else {
-      echo '<center>' . _("No highlighting is defined") . "</center><br>\n";
+      echo _("No highlighting is defined") . "<br>\n";
       echo "<br>\n";
    }
    if ($action == 'edit' || $action == 'add') {
@@ -114,7 +117,7 @@
                ${"selected".$i} = ' selected';
                continue;
             }
-        }
+            }
       }
       if (!isset($message_highlight_list[$theid]['color']))
          $selected_choose = ' checked';
@@ -163,7 +166,8 @@
       echo "            <option value=\"$color_list[13]\"$selected13>" . _("White") . "\n";
       echo "         </select><br>\n";
       echo "         <input type=\"radio\" name=color_type value=2$selected_input> &nbsp;". _("Other:") ."<input type=\"text\" value=\"";
-      if ($selected_input) echo $message_highlight_list[$theid]["color"];
+      if ($selected_input)
+        echo $message_highlight_list[$theid]["color"];
       echo '" name="newcolor_input" size="7"> '._("Ex: 63aa7f")."<br>\n";
       echo "      </td>\n";
       echo "   </tr>\n";
@@ -174,16 +178,26 @@
       echo "      </b></td>\n";
       echo '      <td width="75%">' . "\n";
       echo "         <select name=match_type>\n";
-      if (isset($message_highlight_list[$theid]['match_type']) && $message_highlight_list[$theid]['match_type'] == 'from')    echo "            <option value=\"from\" selected>From\n";
-      else                                                         echo "            <option value=\"from\">From\n";
-      if (isset($message_highlight_list[$theid]['match_type']) && $message_highlight_list[$theid]['match_type'] == 'to')      echo "            <option value=\"to\" selected>To\n";
-      else                                                         echo "            <option value=\"to\">To\n";
-      if (isset($message_highlight_list[$theid]['match_type']) && $message_highlight_list[$theid]['match_type'] == 'cc')      echo "            <option value=\"cc\" selected>Cc\n";
-      else                                                         echo "            <option value=\"cc\">Cc\n";
-      if (isset($message_highlight_list[$theid]['match_type']) && $message_highlight_list[$theid]['match_type'] == 'to_cc')   echo "            <option value=\"to_cc\" selected>To or Cc\n";
-      else                                                         echo "            <option value=\"to_cc\">To or Cc\n";
-      if (isset($message_highlight_list[$theid]['match_type']) && $message_highlight_list[$theid]['match_type'] == 'subject') echo "            <option value=\"subject\" selected>Subject\n";
-      else                                                         echo "            <option value=\"subject\">Subject\n";
+      if (isset($message_highlight_list[$theid]['match_type']) && $message_highlight_list[$theid]['match_type'] == 'from')
+        echo "            <option value=\"from\" selected>From\n";
+      else
+        echo "            <option value=\"from\">From\n";
+      if (isset($message_highlight_list[$theid]['match_type']) && $message_highlight_list[$theid]['match_type'] == 'to')
+        echo "            <option value=\"to\" selected>To\n";
+      else
+        echo "            <option value=\"to\">To\n";
+      if (isset($message_highlight_list[$theid]['match_type']) && $message_highlight_list[$theid]['match_type'] == 'cc')
+        echo "            <option value=\"cc\" selected>Cc\n";
+      else
+        echo "            <option value=\"cc\">Cc\n";
+      if (isset($message_highlight_list[$theid]['match_type']) && $message_highlight_list[$theid]['match_type'] == 'to_cc')
+        echo "            <option value=\"to_cc\" selected>To or Cc\n";
+      else
+        echo "            <option value=\"to_cc\">To or Cc\n";
+      if (isset($message_highlight_list[$theid]['match_type']) && $message_highlight_list[$theid]['match_type'] == 'subject')
+        echo "            <option value=\"subject\" selected>Subject\n";
+      else
+        echo "            <option value=\"subject\">Subject\n";
       echo "         </select>\n";
       if (isset($message_highlight_list[$theid]['value']))
           $disp = $message_highlight_list[$theid]['value'];
@@ -198,7 +212,14 @@
       echo "</table>\n";
       echo '<center><input type="submit" value="' . _("Submit") . "\"></center>\n";
       echo "</form>\n";
-      do_hook('options_highlight_bottom');
    } 
 ?>
+
+   <?php do_hook('options_highlight_bottom'); ?>
+
+    </td></tr>
+    </table>
+
+</td></tr>
+</table>
 </body></html>

diff --git a/src/options_identities.php b/src/options_identities.php
index f1677a1902ba8c17179c447d15cc279a45229c3d..92152a29ff22f7e4811e2d5e78922c0a1be5fe3e 100644 (file)
--- a/src/options_identities.php
+++ b/src/options_identities.php
@@ -33,19 +33,18 @@
 ?>
 <br>
 <table width=95% align=center border=0 cellpadding=2 cellspacing=0>
-  <tr>
-    <th bgcolor="<?php echo $color[0] ?>" align=center>
-      <?php echo _("Options") . " - " . _("Advanced Identities"); ?>
-    </th>
-  </tr>
-</table>
+<tr><td bgcolor="<?php echo $color[0] ?>" align="center">
+
+      <b><?php echo _("Options") . ' - ' . _("Advanced Identities"); ?></b>
+
+    <table width="100%" border="0" cellpadding="1" cellspacing="1">
+    <tr><td bgcolor="<?php echo $color[4] ?>" align="center">
 
-<form name=f action="options_identities.php" method=post>
+<form name=f action="options_identities.php" method=post><br>
 
 <?PHP do_hook('options_identities_top'); ?>
 
-<center>
-<table width=80% cellpadding=0 cellspacing=0 border=0>
+<table width=80% cellpadding=2 cellspacing=0 border=0>
   <tr bgcolor="<?PHP echo $color[9] ?>">
     <th colspan=2 align=center><?PHP echo _("Default Identity") ?></th>
   </tr>
@@ -75,9 +74,15 @@
    ShowTableInfo('', '', '', $num);
 ?>
 </table>   
-</center>
 </form>
+
+    </td></tr>
+    </table>
+
+</td></tr>
+</table>
 </body></html>
+
 <?PHP
 
 function SaveUpdateFunction()

diff --git a/src/options_order.php b/src/options_order.php
index 21bc43fc662d4c4a05ef713719d43ef6506df5a7..f18e44d32d484387a275d85f87d1b287e80379f2 100644 (file)
--- a/src/options_order.php
+++ b/src/options_order.php
@@ -27,11 +27,15 @@
    displayPageHeader($color, 'None');
 ?>
    <br>
-   <table width=95% align=center border=0 cellpadding=2 cellspacing=0><tr><td bgcolor="<?php echo $color[0] ?>">
-      <center><b><?php echo _("Options") . " - " . _("Index Order"); ?></b></center>
-   </td></tr></table>
+<table width=95% align=center border=0 cellpadding=2 cellspacing=0>
+<tr><td align="center" bgcolor="<?php echo $color[0] ?>">
 
-   <table width=95% align=center border=0><tr><td>
+      <b><?php echo _("Options") . " - " . _("Index Order"); ?></b>
+
+    <table width="100%" border="0" cellpadding="1" cellspacing="1">
+    <tr><td bgcolor="<?php echo $color[4] ?>" align="center"><br>
+
+      <table width=100% cellpadding=2 cellspacing=0 border=0>
 <?php
 
    $available[1] = _("Checkbox");
@@ -81,14 +85,12 @@
          setPref($data_dir, $username, "order$i", $index_order[$i]);
       }
    }
-   echo '<center>';
    echo '<table cellspacing="0" cellpadding="0" border="0" width="65%"><tr><td>' . "\n";
    echo _("The index order is the order that the columns are arranged in the message index.  You can add, remove, and move columns around to customize them to fit your needs.");
-   echo '</td></tr></table></center><br>';
+   echo '</td></tr></table><br>';
 
    if (count($index_order))
    {
-      echo '<center>';
       echo '<table cellspacing="0" cellpadding="0" border="0">' . "\n";
       for ($i=1; $i <= count($index_order); $i++) {
          $tmp = $index_order[$i];
@@ -107,31 +109,37 @@
          echo "</tr>\n";
       }
       echo "</table>\n";
-      echo '</center>';
    }
    
    if (count($index_order) != count($available)) {
-   echo '<center><form name="f" method="post" action="options_order.php">';
-   echo '<select name="add">';
-   for ($i=1; $i <= count($available); $i++) {
-      $found = false;
-      for ($j=1; $j <= count($index_order); $j++) {
-         if ($index_order[$j] == $i) {
-            $found = true;
+      echo '<form name="f" method="post" action="options_order.php">';
+      echo '<select name="add">';
+      for ($i=1; $i <= count($available); $i++) {
+         $found = false;
+         for ($j=1; $j <= count($index_order); $j++) {
+            if ($index_order[$j] == $i) {
+               $found = true;
+            }
+         }
+         if (!$found) {
+            echo "<option value=\"$i\">$available[$i]</option>";
          }
       }
-      if (!$found) {
-         echo "<option value=\"$i\">$available[$i]</option>";
-      }
-   }
-   echo '</select>';
-   echo '<input type="hidden" value="add" name="method">';
-   echo '<input type="submit" value="'._("Add").'" name="submit">';
-   echo '</form></center>';
+      echo '</select>';
+      echo '<input type="hidden" value="add" name="method">';
+      echo '<input type="submit" value="'._("Add").'" name="submit">';
+      echo '</form>';
    }
 
-   echo '<br><center><a href="../src/options.php">' . _("Return to options page") . '</a></center>';
+   echo '<p><a href="../src/options.php">' . _("Return to options page") . '</a></p><br>';
 
 ?>
-   </td></tr></table>
+   </td></tr>
+   </table>
+
+    </td></tr>
+    </table>
+
+</td></tr>
+</table>
 </body></html>

diff --git a/src/options_personal.php b/src/options_personal.php
index 98080dd3ce8ea4187ff02039d9f31b97c7ab6fc6..8f6291ebb5232b08fe7401dd37aac9b531db2950 100644 (file)
--- a/src/options_personal.php
+++ b/src/options_personal.php
@@ -26,12 +26,16 @@
 
 ?>
    <br>
-   <table width=95% align=center border=0 cellpadding=2 cellspacing=0><tr><td bgcolor="<?php echo $color[0] ?>">
-      <center><b><?php echo _("Options") . " - " . _("Personal Information"); ?></b></center>
-   </td></tr></table>
+<table width=95% align=center border=0 cellpadding=2 cellspacing=0>
+<tr><td align="center" bgcolor="<?php echo $color[0] ?>">
 
-   <form name=f action="options.php" method=post>
-      <table width=100% cellpadding=0 cellspacing=2 border=0>
+      <b><?php echo _("Options") . " - " . _("Personal Information"); ?></b>
+
+    <table width="100%" border="0" cellpadding="1" cellspacing="1">
+    <tr><td bgcolor="<?php echo $color[4] ?>" align="center">
+
+   <form name=f action="options.php" method=post><br>
+      <table width=100% cellpadding=2 cellspacing=0 border=0>
          <tr>
             <td align=right nowrap><?php echo _("Full Name"); ?>:
             </td><td>
@@ -51,9 +55,10 @@
             </td>
          </tr>
         <tr>
-           <td align=right nowrap>&nbsp;
+           <td align=right nowrap><?PHP echo _("Multiple Identities"); ?>:
            </td><td>
-              <a href="options_identities.php"><?php echo _("Edit multiple identities"); ?></a>
+              <a href="options_identities.php">Edit Advanced Identities</a>
+               (discards changes made on this form so far)
            </td>
         </tr>
          <tr><td colspan=2><hr size=1 width=80%></td></tr>
@@ -83,6 +88,13 @@
             </td>
          </tr>
       </table>   
-   </form>
+</form>
+
    <?php do_hook('options_personal_bottom'); ?>
+
+    </td></tr>
+    </table>
+
+</td></tr>
+</table>
 </body></html>

diff --git a/src/read_body.php b/src/read_body.php
index 0e9c0faf5941825d0e517c37f3cf507f5ceeddda..ee8ebebc6d1e222acc62a211328c9f5f03c6ba2b 100644 (file)
--- a/src/read_body.php
+++ b/src/read_body.php
@@ -337,9 +337,9 @@
    echo '   <TABLE WIDTH="100%" BORDER="0" CELLSPACING="0" CELLPADDING="3">' . "\n";
    echo '      <TR>' . "\n";
    /** subject **/
-   echo "         <TD BGCOLOR=\"$color[0]\" WIDTH=10% ALIGN=RIGHT>\n";
+   echo "         <TD BGCOLOR=\"$color[0]\" WIDTH=\"10%\" ALIGN=\"right\" VALIGN=\"top\">\n";
    echo _("Subject:");
-   echo "         </TD><TD BGCOLOR=\"$color[0]\" WIDTH=80%>\n";
+   echo "         </TD><TD BGCOLOR=\"$color[0]\" WIDTH=\"80%\" VALIGN=\"top\">\n";
    echo "            <B>$subject</B>&nbsp;\n";
    echo "         </TD>\n";
    echo '         <TD ROWSPAN="4" width=10% BGCOLOR="'.$color[0].'" ALIGN=right VALIGN=top NOWRAP><small>' . "\n";