From e7db48afbf9565737173583af6962520d2491acc Mon Sep 17 00:00:00 2001 From: allah03 Date: Tue, 15 May 2001 06:08:59 +0000 Subject: [PATCH] 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 --- functions/page_header.php | 4 +- src/compose.php | 8 ++-- src/folders.php | 59 +++++++++++++++++--------- src/options.php | 43 ++++++++++++------- src/options_display.php | 86 ++++++++++---------------------------- src/options_folder.php | 22 +++++++--- src/options_highlight.php | 55 ++++++++++++++++-------- src/options_identities.php | 25 ++++++----- src/options_order.php | 58 ++++++++++++++----------- src/options_personal.php | 28 +++++++++---- src/read_body.php | 4 +- 11 files changed, 219 insertions(+), 173 deletions(-) diff --git a/functions/page_header.php b/functions/page_header.php index 9dc2a5c2..6b6663ed 100644 --- a/functions/page_header.php +++ b/functions/page_header.php @@ -75,7 +75,7 @@ echo "\n\n"; echo "\n"; echo " \n"; - echo " \n"; echo " \n"; diff --git a/src/compose.php b/src/compose.php index 19d83136..b1a92215 100644 --- a/src/compose.php +++ b/src/compose.php @@ -222,9 +222,9 @@ if ($idents != '' && $idents > 1) { echo " \n"; - echo " \n"; } echo " \n"; - echo " \n"; diff --git a/src/folders.php b/src/folders.php index 95d938cb..a1f2f426 100644 --- a/src/folders.php +++ b/src/folders.php @@ -21,18 +21,26 @@ displayPageHeader($color, _("None")); - echo "
"; - echo "
\n"; + echo " \n"; $urlMailbox = urlencode($mailbox); displayInternalLink ("src/compose.php?mailbox=$urlMailbox", _("Compose"), "right"); echo "  \n"; @@ -92,7 +92,7 @@ do_hook("menuline"); - echo " \n"; + echo " \n"; echo " SquirrelMail\n"; echo "
\n"; + echo " \n"; echo _("From:"); - echo " \n"; + echo " \n"; echo "
\n"; + echo " \n"; echo _("To:"); - echo " \n"; + echo " \n"; printf("
\n", htmlspecialchars($send_to)); echo "
\n"; - echo " \n"; - echo "
\n"; - echo _("Folders"); - echo "
\n"; +?> + +
+ +
+ + +
+ + + + +
+ +\n"; - echo "
\n"; + echo "\n"; + echo " \n"; + echo " \n"; echo "
\n"; if ($success == "subscribe") { echo "" . _("Subscribed successfully!") . "
"; } else if ($success == "unsubscribe") { @@ -56,7 +64,7 @@ } echo " " . _("refresh folder list") . ""; - echo "

\n"; } $imapConnection = sqimap_login ($username, $key, $imapServerAddress, $imapPort, 0); @@ -169,9 +177,9 @@ } } } - echo "
\n"; + echo "\n"; if ($show_contain_subfolders_option) { - echo "  "; + echo "
 "; echo _("Let this folder contain subfolders"); echo "
"; } @@ -214,11 +222,11 @@ echo "
 
\n"; /** UNSUBSCRIBE FOLDERS **/ - echo "\n"; - echo " +
"; + echo "\n"; + echo ""; - echo "\n"; + echo ""; - /** SUBSCRIBE TO FOLDERS **/ - echo "
"; echo _("Unsubscribe") . "/" . _("Subscribe"); - echo "
"; + echo "
\n"; if ($count_special_folders < count($boxes)) { echo "
\n"; echo "
 "; + echo ""; $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!") . "
"; } +?> + + + + - do_hook("folders_bottom"); +
+ +
+ + - + +
+ diff --git a/src/options.php b/src/options.php index f78d285b..1dd0b642 100644 --- a/src/options.php +++ b/src/options.php @@ -23,15 +23,20 @@ } include('../src/load_prefs.php'); - displayPageHeader($color, 'None'); + displayPageHeader($color, _("None")); ?> +
+
- -
-
-
+ + +
+ +
+ + + +
'._("Successfully saved personal information!").'

'; + echo '
'._("Successfully saved personal information!").'
'; } 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 '
'._("Successfully saved display preferences!").'
'; - echo '' . _("Refresh Page") . '

'; + echo '
'._("Successfully saved display preferences!").'
'; + echo '' . _("Refresh Page") . '
'; } 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 '
'._("Successfully saved folder preferences!").'
'; - echo '' . _("Refresh Folder List") . '

'; + echo '
'._("Successfully saved folder preferences!").'
'; + echo '' . _("Refresh Folder List") . '
'; } else { do_hook('options_save'); } ?> - - +
+
@@ -192,7 +196,16 @@
- + + + + +
+ +
+ + + diff --git a/src/options_display.php b/src/options_display.php index a8ea0852..7c5e34ce 100644 --- a/src/options_display.php +++ b/src/options_display.php @@ -22,12 +22,16 @@ $chosen_language = getPref($data_dir, $username, 'language'); ?>
-
-
-
+ + +
- - +
+ +
+
+ +
+ -
: @@ -164,80 +168,25 @@ else echo '
+
+ + +
+ +
diff --git a/src/options_folder.php b/src/options_folder.php index 2b62364e..139a85f1 100644 --- a/src/options_folder.php +++ b/src/options_folder.php @@ -25,12 +25,17 @@ sqimap_logout($imapConnection); ?>
-
-
-
+ + +
-
- + + +
+ +
+ +
+ + @@ -137,5 +142,12 @@
+ + +
+ +
diff --git a/src/options_highlight.php b/src/options_highlight.php index c2aa0864..7d96320c 100644 --- a/src/options_highlight.php +++ b/src/options_highlight.php @@ -51,10 +51,13 @@ displayPageHeader($color, 'None'); ?>
-
-
-
+ + \n"; echo " \n"; @@ -174,16 +178,26 @@ echo " \n"; echo '
+ + + +
[' . _("New") . ']'; echo ' - ['._("Done").']

'."\n"; @@ -76,7 +79,7 @@ echo "
\n"; echo "
\n"; } else { - echo '
' . _("No highlighting is defined") . "

\n"; + echo _("No highlighting is defined") . "
\n"; echo "
\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 "
' . "\n"; echo " \n"; if (isset($message_highlight_list[$theid]['value'])) $disp = $message_highlight_list[$theid]['value']; @@ -198,7 +212,14 @@ echo "
\n"; echo '
\n"; echo "\n"; - do_hook('options_highlight_bottom'); } ?> + + + + + + + + diff --git a/src/options_identities.php b/src/options_identities.php index f1677a19..92152a29 100644 --- a/src/options_identities.php +++ b/src/options_identities.php @@ -33,19 +33,18 @@ ?>
- - - -
- -
+ + + + + + +
-
+
-
- +
@@ -75,9 +74,15 @@ ShowTableInfo('', '', '', $num); ?>
-
+ +
+ + + +
-
-
-
+ + +
-
+ + + +

+ + '; echo '
' . "\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 '

'; + echo '

'; if (count($index_order)) { - echo '
'; echo '' . "\n"; for ($i=1; $i <= count($index_order); $i++) { $tmp = $index_order[$i]; @@ -107,31 +109,37 @@ echo "\n"; } echo "
\n"; - echo '
'; } if (count($index_order) != count($available)) { - echo '
'; - echo ''; + 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 ""; } } - if (!$found) { - echo ""; - } - } - echo ''; - echo ''; - echo ''; - echo '
'; + echo ''; + echo ''; + echo ''; + echo ''; } - echo '
' . _("Return to options page") . '
'; + echo '

' . _("Return to options page") . '


'; ?> -
+
+ + + + + + diff --git a/src/options_personal.php b/src/options_personal.php index 98080dd3..8f6291eb 100644 --- a/src/options_personal.php +++ b/src/options_personal.php @@ -26,12 +26,16 @@ ?>
-
-
-
+ + +
-
- + + +
+ +
+ +
+ - @@ -83,6 +88,13 @@
: @@ -51,9 +55,10 @@
  + : - + Edit Advanced Identities + (discards changes made on this form so far)
- + + + +
+ +
diff --git a/src/read_body.php b/src/read_body.php index 0e9c0faf..ee8ebebc 100644 --- a/src/read_body.php +++ b/src/read_body.php @@ -337,9 +337,9 @@ echo ' ' . "\n"; echo ' ' . "\n"; /** subject **/ - echo " \n"; echo '
\n"; + echo " \n"; echo _("Subject:"); - echo " \n"; + echo " \n"; echo " $subject \n"; echo " ' . "\n"; -- 2.25.1