Folder list bar on left/right

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

diff --git a/po/squirrelmail.po b/po/squirrelmail.po
index c4494b67774cc8a1db1eb709adeadd759bc798cd..75e4a835ad8da643bf08b0d01c327bd063287e0d 100644 (file)
--- a/po/squirrelmail.po
+++ b/po/squirrelmail.po
@@ -554,7 +554,19 @@ msgid "Size of editor window"
 msgstr ""
 
 #: squirrelmail/src/options_display.php:121
 msgstr ""
 
 #: squirrelmail/src/options_display.php:121

-msgid "Width of left folder list"
+msgid "Location of folder list"
+msgstr ""
+
+#: squirrelmail/src/options_display.php:125
+msgid "Left"
+msgstr ""
+
+#: squirrelmail/src/options_display.php:128
+msgid "Right"
+msgstr ""
+
+#: squirrelmail/src/options_display.php:121
+msgid "Width of folder list"

 msgstr ""
 
 #: squirrelmail/src/options_display.php:175
 msgstr ""
 
 #: squirrelmail/src/options_display.php:175

diff --git a/src/load_prefs.php b/src/load_prefs.php
index fefc5c37e433fae0cf9c7b09f88fbbcb6841e962..391ff21394bbb0314b8704ab59feb7701189314c 100644 (file)
--- a/src/load_prefs.php
+++ b/src/load_prefs.php
@@ -147,6 +147,10 @@
       $message_highlight_list[$i]["value"] = $ary[2];
       $message_highlight_list[$i]["match_type"] = $ary[3];
    }
       $message_highlight_list[$i]["value"] = $ary[2];
       $message_highlight_list[$i]["match_type"] = $ary[3];
    }

+   
+   $location_of_bar = getPref($data_dir, $username, 'location_of_bar');
+   if ($location_of_bar == '')
+       $location_of_bar = 'left';

 
    do_hook("loading_prefs");
 
 
    do_hook("loading_prefs");
 

diff --git a/src/options.php b/src/options.php
index 1bd019a0a07a7cfdfe571a8744f1af12128bd25b..7e2b1aa479b89538dfb30a32a5dd20c45eb19cca 100644 (file)
--- a/src/options.php
+++ b/src/options.php
@@ -65,6 +65,7 @@
       setPref($data_dir, $username, "editor_size", $editorsize);
       setPref($data_dir, $username, "left_refresh", $leftrefresh);
       setPref($data_dir, $username, "language", $language);
       setPref($data_dir, $username, "editor_size", $editorsize);
       setPref($data_dir, $username, "left_refresh", $leftrefresh);
       setPref($data_dir, $username, "language", $language);

+      setPref($data_dir, $username, 'location_of_bar', $folder_new_location);

       setPref($data_dir, $username, "left_size", $leftsize);
       setPref($data_dir, $username, "use_javascript_addr_book", $javascript_abook);
     
       setPref($data_dir, $username, "left_size", $leftsize);
       setPref($data_dir, $username, "use_javascript_addr_book", $javascript_abook);
     

diff --git a/src/options_display.php b/src/options_display.php
index 7cdb3ed9faea0b6f764b5fb0969827a674b52c8f..37227bd6637ea70d14014f8c2ce5fc2012354865 100644 (file)
--- a/src/options_display.php
+++ b/src/options_display.php
@@ -118,7 +118,19 @@
             </td>
          </tr>
          <tr>
             </td>
          </tr>
          <tr>

-            <td align=right nowrap><?php echo _("Width of left folder list"); ?>:
+            <td align=right nowrap><?PHP echo _('Location of folder list') ?>:</td>
+            <td><select name="folder_new_location">
+                <option value="left"<?PHP
+                    if ($location_of_bar != 'right') echo ' SELECTED';
+                    ?>><?PHP echo _('Left'); ?></option>
+                <option value="right"<?PHP
+                    if ($location_of_bar == 'right') echo ' SELECTED';
+                    ?>><?PHP echo _('Right'); ?></option>
+                </select>
+            </td>
+         </tr>
+         <tr>
+            <td align=right nowrap><?php echo _("Width of folder list"); ?>:

             </td><td>
 <?php
    echo "         <select name=leftsize>\n";
             </td><td>
 <?php
    echo "         <select name=leftsize>\n";

diff --git a/src/webmail.php b/src/webmail.php
index b7fb6d7c076e7aa71fd8a2abc19b438f68000088..d0ad62b1ce3b408616e0fa2e4667949e708d28c2 100644 (file)
--- a/src/webmail.php
+++ b/src/webmail.php
@@ -71,8 +71,15 @@
    echo "$org_title";
    echo "</TITLE>";
    $ishelp = substr(getenv(REQUEST_URI),-8);                   // If calling help, set left frame to 300
    echo "$org_title";
    echo "</TITLE>";
    $ishelp = substr(getenv(REQUEST_URI),-8);                   // If calling help, set left frame to 300

-   if ($ishelp == "help.php") {                        
-      echo "<FRAMESET COLS=\"300, *\" NORESIZE=yes BORDER=0>";
+   
+   if (ishelp == 'help.php')
+       $bar_size = 300;
+   else
+       $bar_size = $left_size;
+   
+   if ($location_of_bar == 'right')
+   {
+      echo "<FRAMESET COLS=\"*, $left_size\" NORESIZE=yes BORDER=0>";

    } else {
       echo "<FRAMESET COLS=\"$left_size, *\" NORESIZE BORDER=0>";
    }
    } else {
       echo "<FRAMESET COLS=\"$left_size, *\" NORESIZE BORDER=0>";
    }


@@ -91,19 +98,25 @@
 **/
    if ($right_frame == "right_main.php") {
       $urlMailbox = urlencode($mailbox);
 **/
    if ($right_frame == "right_main.php") {
       $urlMailbox = urlencode($mailbox);

-      echo "<FRAME SRC=\"left_main.php\" NAME=\"left\">";
-      echo "<FRAME SRC=\"right_main.php?mailbox=$urlMailbox&sort=$sort&startMessage=$startMessage\" NAME=\"right\">";
+      $right_frame_url = "right_main.php?mailbox=$urlMailbox&sort=$sort&startMessage=$startMessage";

    } else if ($right_frame == "options.php") {
    } else if ($right_frame == "options.php") {

-      echo "<FRAME SRC=\"left_main.php\" NAME=\"left\">";
-      echo "<FRAME SRC=\"options.php\" NAME=\"right\">";
+      $right_frame_url = "options.php";

    } else if ($right_frame == "folders.php") {
    } else if ($right_frame == "folders.php") {

-      $urlMailbox = urlencode($mailbox);
-      echo "<FRAME SRC=\"left_main.php\" NAME=\"left\">";
-      echo "<FRAME SRC=\"folders.php\" NAME=\"right\">";
+      $right_frame_url = "folders.php";

    } else {
    } else {

-      echo "<FRAME SRC=\"left_main.php\" NAME=\"left\">";

       if (!isset($just_logged_in)) $just_logged_in = 0;
       if (!isset($just_logged_in)) $just_logged_in = 0;

-      echo "<FRAME SRC=\"right_main.php?just_logged_in=$just_logged_in\" NAME=\"right\">";
+      $right_frame_url = "right_main.php?just_logged_in=$just_logged_in";
+   }
+
+   if ($location_of_bar == 'right')
+   {
+      echo "<FRAME SRC=\"$right_frame_url\" NAME=\"right\">";
+      echo "<FRAME SRC=\"left_main.php\" NAME=\"left\">";
+   }
+   else
+   {
+      echo "<FRAME SRC=\"left_main.php\" NAME=\"left\">";
+      echo "<FRAME SRC=\"$right_frame_url\" NAME=\"right\">";

    }
 
 ?>
    }
 
 ?>