X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fstatic%2Ft%2Fedit_message.html;h=19b76728cc4c4c0e781e3f247f13098dc98d7983;hb=82932fb6b663050ba7812555ddfb526a4fbe98b0;hp=080dc26f373a44de3a72af1f985b1286cb620c07;hpb=6bc8b600d0311eaf952ddc9b343d781776677783;p=citadel.git

diff --git a/webcit/static/t/edit_message.html b/webcit/static/t/edit_message.html
index 080dc26f3..19b76728c 100644
--- a/webcit/static/t/edit_message.html
+++ b/webcit/static/t/edit_message.html
@@ -1,8 +1,6 @@
 <?=("head")>
 <?=("important_msg")>
-<?ICONBAR>
 <?ROOMBANNER>
-</div>
 <div id="content">
 <div class="fix_scrollbar_bug message "><form enctype="multipart/form-data" method="POST" accept-charset="UTF-8" action="post" name="enterform">
 <input type="hidden" name="postseq" value="<?DATE:NOW:NO>">
@@ -12,6 +10,8 @@
 <input type="hidden" name="references" value="<?BSTR("references")>">
 
 <p class="send_edit_msg">
+  <input type="submit" name="save_button" value="<?_("Save to Drafts")>">
+&nbsp;
 <?!("COND:SUBST", 1, "RCPTREQUIRED")><input type="submit" name="send_button" value="<?_("Send message")>"><?!("X", 1)>
 <??("COND:SUBST", 2, "RCPTREQUIRED")><input type="submit" name="send_button" value="<?_("Post message")>"><?!("X", 2)>
 &nbsp;
@@ -65,7 +65,7 @@
 </tr>
 <tr>
   <th><label for="bcc_id"><?_("BCC:")></label></th>
-  <td><input autocomplete="off" type="text" name="bcc" id="bcc_id" value="<?BSTR("cc", "H")>" size=45 maxlength=1000 />
+  <td><input autocomplete="off" type="text" name="bcc" id="bcc_id" value="<?BSTR("bcc", "H")>" size=45 maxlength=1000 />
    <div class="auto_complete" id="bcc_name_choices"></div>
   </td>
 </tr>
@@ -76,11 +76,11 @@
       <??("COND:SUBST", 7, "SUBJREQUIRED")><?_("Subject (optional):")><??("X", 7)>
   </label></th>
   <td colspan="2">
-    <input type="text" name="subject" id="subject_id" value="<?BSTR("subject", "U")>" size=45 maxlength=70>
+    <input type="text" name="subject" id="subject_id" value="<?BSTR("subject", "H")>" size=45 maxlength=70>
   </td>
 </tr>
 <tr><td colspan="3">
-
+<input type="hidden" name="sig_inserted" value="yes">
 
 <textarea name="msgtext" cols="80" rows="15">
 <?BSTR("msgtext")>
@@ -99,12 +99,18 @@
     <?MAIL:QUOTETEXT("replyquote", "X")>
 &lt;br /&gt;
 <?!("X", 2)>
-<??("COND:BSTR", 3, "sig_inserted", "yes")>
-  <?!("COND:PREF", 4, "use_sig", "yes")>
-    &lt;br&gt;--&lt;br&gt;
-    <?PREF:VALUE("signature","H")>
-  <?!("X", 4)>
-<??("X", 3)>
+<?!("COND:BSTR", 3, "edit")>
+    <?MAIL:EDITTEXT("edit", "X")>
+<?!("X", 3)>
+<??("COND:BSTR", 4, "edit")>
+  <??("COND:BSTR", 5, "sig_inserted", "yes")>
+    <?!("COND:PREF", 6, "use_sig", "yes")>
+      &lt;br&gt;&lt;p&gt;--&nbsp;&lt;br&gt;
+      <?PREF:VALUE("signature","H")>
+      &lt;/p&gt;
+    <?!("X", 6)>
+  <??("X", 5)>
+<?!("X", 4)>
 </textarea>
 <?=("richedit")>
 
@@ -124,7 +130,7 @@
  activate_entmsg_autocompleters();	
 
 </script>
-
+</div>
 </div>
 </div>
 <?=("addressbook_popup")>