From 480feea74f9955ea0b60d4968dde947d0c1291f7 Mon Sep 17 00:00:00 2001
From: lkehresman <lkehresman@7612ce4b-ef26-0410-bec9-ea0150e637f0>
Date: Sun, 18 Jun 2000 02:52:08 +0000
Subject: [PATCH] moved buttons on compose form so they are more accessable to
 smaller displays.  Someone requested this on the mailing list.

git-svn-id: https://svn.code.sf.net/p/squirrelmail/code/trunk/squirrelmail@543 7612ce4b-ef26-0410-bec9-ea0150e637f0
---
 functions/imap_mailbox.php |  1 +
 src/compose.php            | 42 +++++++++++++++++++-------------------
 2 files changed, 22 insertions(+), 21 deletions(-)

diff --git a/functions/imap_mailbox.php b/functions/imap_mailbox.php
index 169633c8..c4c9da99 100755
--- a/functions/imap_mailbox.php
+++ b/functions/imap_mailbox.php
@@ -146,6 +146,7 @@
       $inbox_subscribed = false;
       fputs ($imap_stream, "a001 LSUB \"\" \"*\"\r\n");
       $lsub_ary = sqimap_read_data ($imap_stream, "a001", true, $response, $message);
+   
       for ($i=0;$i < count($lsub_ary); $i++) {
          $sorted_lsub_ary[$i] = find_mailbox_name($lsub_ary[$i]);
          if ($sorted_lsub_ary[$i] == "INBOX")
diff --git a/src/compose.php b/src/compose.php
index 85cd024b..e7c920a3 100644
--- a/src/compose.php
+++ b/src/compose.php
@@ -193,21 +193,9 @@
       echo _("BCC:");
       echo "      </TD><TD BGCOLOR=\"$color[4]\" ALIGN=LEFT>\n";
       if ($send_to_bcc)
-         echo "         <INPUT TYPE=TEXT NAME=\"send_to_bcc\" VALUE=\"$send_to_bcc\" SIZE=55><BR>\n";
+         echo "         <INPUT TYPE=TEXT NAME=\"send_to_bcc\" VALUE=\"$send_to_bcc\" SIZE=60><BR>\n";
       else
-         echo "         <INPUT TYPE=TEXT NAME=\"send_to_bcc\" SIZE=55><BR>";
-      echo "      </TD>\n";
-      echo "<TD width=\"1%\" BGCOLOR=\"$color[4]\" ALIGN=Right>";
-      
-      if ($use_javascript_addr_book) {
-         echo "<SCRIPT LANGUAGE=JavaScript><!--\n document.write(\"";
-         echo "<input type=button value=\\\""._("Addresses")."\\\" onclick='javascript:open_abook();'>\");";
-         echo "// --></SCRIPT><NOSCRIPT>\n";
-         echo "<input type=submit name=\"html_addr_search\" value=\""._("Addresses")."\">";
-         echo "</NOSCRIPT>\n";
-      } else {  
-         echo "<input type=submit name=\"html_addr_search\" value=\""._("Addresses")."\">";
-      }   
+         echo "         <INPUT TYPE=TEXT NAME=\"send_to_bcc\" SIZE=60><BR>";
       
       echo "</TD></TR>\n";
 
@@ -221,7 +209,7 @@
          $reply_subj = trim($reply_subj);
          if (substr(strtolower($reply_subj), 0, 3) != "re:")
             $reply_subj = "Re: $reply_subj";
-         echo "         <INPUT TYPE=TEXT NAME=subject SIZE=55 VALUE=\"$reply_subj\">";
+         echo "         <INPUT TYPE=TEXT NAME=subject SIZE=60 VALUE=\"$reply_subj\">";
       } else if ($forward_subj) {
          $forward_subj = str_replace("\"", "'", $forward_subj);
          $forward_subj = stripslashes($forward_subj);
@@ -230,14 +218,26 @@
              (substr(strtolower($forward_subj), 0, 5) != "[fwd:") &&
              (substr(strtolower($forward_subj), 0, 6) != "[ fwd:"))
             $forward_subj = "[Fwd: $forward_subj]";
-         echo "         <INPUT TYPE=TEXT NAME=subject SIZE=55 VALUE=\"$forward_subj\">";
+         echo "         <INPUT TYPE=TEXT NAME=subject SIZE=60 VALUE=\"$forward_subj\">";
       } else {
-         echo "         <INPUT TYPE=TEXT NAME=subject VALUE=\"$subject\" SIZE=55>";
+         echo "         <INPUT TYPE=TEXT NAME=subject VALUE=\"$subject\" SIZE=60>";
       }
-      echo "</td><td align=right>";
-      echo "<INPUT TYPE=SUBMIT NAME=send VALUE=\"". _("Send") . "\">";
-      echo "      </TD>\n";
-      echo "   </TR>\n";
+      echo "</td></tr>\n\n";
+
+      echo "   <TR><td>\n   </td><td>\n";
+      if ($use_javascript_addr_book) {
+         echo "      <SCRIPT LANGUAGE=JavaScript><!--\n document.write(\"";
+         echo "         <input type=button value=\\\""._("Addresses")."\\\" onclick='javascript:open_abook();'>\");";
+         echo "         // --></SCRIPT><NOSCRIPT>\n";
+         echo "         <input type=submit name=\"html_addr_search\" value=\""._("Addresses")."\">";
+         echo "      </NOSCRIPT>\n";
+      } else {  
+         echo "      <input type=submit name=\"html_addr_search\" value=\""._("Addresses")."\">";
+      }   
+      echo "\n    <INPUT TYPE=SUBMIT NAME=send VALUE=\"". _("Send") . "\">\n";
+      echo "   </TD>\n";
+      echo "   </TR>\n\n";
+
 
       echo "   <TR>\n";
       echo "      <TD BGCOLOR=\"$color[4]\" COLSPAN=3>\n";
-- 
2.25.1