Moved attachment adding during compose to bottom

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

diff --git a/po/squirrelmail.po b/po/squirrelmail.po
index 8b93c988bff3a148c2bfd785b823c46e963a2b66..430d5d8cb9acf49461d95e22b69b9330bbe62896 100644 (file)
--- a/po/squirrelmail.po
+++ b/po/squirrelmail.po
@@ -6,7 +6,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
-"POT-Creation-Date: 2000-02-09 07:13-0500\n"
+"POT-Creation-Date: 2000-02-09 07:26-0500\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -34,35 +34,35 @@ msgstr ""
 msgid "Subject:"
 msgstr ""
 
-#: squirrelmail/src/compose.php:215
-msgid "Attach:"
+#: squirrelmail/src/compose.php:220
+msgid "Send"
 msgstr ""
 
-#: squirrelmail/src/compose.php:221
-msgid "Add"
+#: squirrelmail/src/compose.php:227
+msgid "Attach:"
 msgstr ""
 
 #: squirrelmail/src/compose.php:233
-msgid "Delete selected attachments"
+msgid "Add"
 msgstr ""
 
-#: squirrelmail/src/compose.php:247
-msgid "Send"
+#: squirrelmail/src/compose.php:246
+msgid "Delete selected attachments"
 msgstr ""
 
-#: squirrelmail/src/compose.php:264
+#: squirrelmail/src/compose.php:266
 msgid "You have not entered a message body."
 msgstr ""
 
-#: squirrelmail/src/compose.php:268
+#: squirrelmail/src/compose.php:270
 msgid "You have not filled in the \"To:\" field."
 msgstr ""
 
-#: squirrelmail/src/compose.php:271
+#: squirrelmail/src/compose.php:273
 msgid "You have not entered a subject."
 msgstr ""
 
-#: squirrelmail/src/compose.php:292
+#: squirrelmail/src/compose.php:294
 msgid "Could not move/copy file. File not attached"
 msgstr ""
 

diff --git a/src/compose.php b/src/compose.php
index 2af8b6bd5078caab02fd2802c4f3276a95d7526a..87d52712b0c8ca6e978608d392d4cbf47c03460b 100644 (file)
--- a/src/compose.php
+++ b/src/compose.php
@@ -208,12 +208,24 @@
       echo "      </TD>\n";
       echo "   </TR>\n";
 
+      echo "   <TR>\n";
+      echo "      <TD BGCOLOR=\"$color[4]\" COLSPAN=2>\n";
+      if ($use_signature == true)
+         echo "         &nbsp;&nbsp;<TEXTAREA NAME=body ROWS=20 COLS=\"$editor_size\" WRAP=HARD>". $body . "\n\n".$signature."</TEXTAREA><BR>";
+      else
+         echo "         &nbsp;&nbsp;<TEXTAREA NAME=body ROWS=20 COLS=\"$editor_size\" WRAP=HARD>".$body."</TEXTAREA><BR>\n";
+      echo "      </TD>\n";
+      echo "   </TR>\n";
+      echo "   <TR><TD COLSPAN=2 ALIGN=CENTER><INPUT TYPE=SUBMIT NAME=send VALUE=\"";
+      echo _("Send");
+      echo "\"></TD></TR>\n";
+      
       // This code is for attachments
       echo "   <tr>\n";
-      echo "     <TD WIDTH=50 BGCOLOR=\"$color[4]\" VALIGN=TOP ALIGN=RIGHT>\n";
+      echo "     <TD WIDTH=50 BGCOLOR=\"$color[0]\" VALIGN=TOP ALIGN=RIGHT>\n";
       echo "      <FONT FACE=\"Arial,Helvetica\">";
       echo "      <SMALL><BR></SMALL>"._("Attach:")."</FONT>\n";
-      echo "      </td><td width=% ALIGN=left>\n";
+      echo "      </td><td width=% ALIGN=left BGCOLOR=\"$color[0]\">\n";
       //      echo "      <INPUT TYPE=\"hidden\" name=\"MAX_FILE_SIZE\"\n";
       //      echo "      value=\"10000\">\n";
       echo "      <INPUT NAME=\"attachfile\" TYPE=\"file\">\n";
@@ -223,8 +235,9 @@
       echo "     </font>\n";
       echo "   </tr>\n";
       if (isset($attachments) && count($attachments)>0) {
-         echo "</tr><tr><td width=50 align=right>\n";
-         echo "</td><td width=% align=left>";
+         echo "</tr><tr><td width=50 bgcolor=\"$color[0]\" align=right>\n";
+         echo "&nbsp;";
+         echo "</td><td width=% align=left bgcolor=\"$color[0]\">";
          while (list($localname, $remotename) = each($attachments)) {
             echo "<input type=\"checkbox\" name=\"delete[]\" value=\"$localname\">\n";
             echo "$remotename <input type=\"hidden\" name=\"attachments[$localname]\" value=\"$remotename\"><br>\n";
@@ -235,17 +248,6 @@
       }
       // End of attachment code
 
-      echo "   <TR>\n";
-      echo "      <TD BGCOLOR=\"$color[4]\" COLSPAN=2>\n";
-      if ($use_signature == true)
-         echo "         &nbsp;&nbsp;<TEXTAREA NAME=body ROWS=20 COLS=\"$editor_size\" WRAP=HARD>". $body . "\n\n".$signature."</TEXTAREA><BR>";
-      else
-         echo "         &nbsp;&nbsp;<TEXTAREA NAME=body ROWS=20 COLS=\"$editor_size\" WRAP=HARD>".$body."</TEXTAREA><BR>\n";
-      echo "      </TD>\n";
-      echo "   </TR>\n";
-      echo "   <TR><TD COLSPAN=2 ALIGN=CENTER><INPUT TYPE=SUBMIT NAME=send VALUE=\"";
-      echo _("Send");
-      echo "\"></TD></TR>\n";
       echo "</TABLE>\n";
       echo "</FORM>";
    }