* reorganize some templates into subdirectories

[citadel.git] / webcit / static / t / edit_message.html

diff --git a/webcit/static/t/edit_message.html b/webcit/static/t/edit_message.html
index 3c02d02cf1ca650b3dea77e69a6b37251eb658af..7f25156bf952b150ec621e2e92b34d29a1ad1f6f 100644 (file)
--- a/webcit/static/t/edit_message.html
+++ b/webcit/static/t/edit_message.html
@@ -1,36 +1,48 @@
 <?=("head")>
-<?=("important_msg")>
-<?ICONBAR>
+<?=("important_msg")><?%("COND:LOGGEDIN", 1, 1, 1, "", ="paging")>
 <?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>">
 <input type="hidden" name="return_to" value="<?BSTR("return_to")>">
 <input type="hidden" name="nonce" value="<?NONCE>">
-<input type="hidden" name="force_room" value="<?ROOMNAME>">
+<input type="hidden" name="force_room" value="<?ROOMNAME("X")>">
 <input type="hidden" name="references" value="<?BSTR("references")>">
+<input type="hidden" name="page" value="<?BSTR("page")>">
 
 <p class="send_edit_msg">
 <?!("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;
+<!-- temporarily disabled for 7.60
+  <input type="submit" name="save_button" value="<?_("Save to Drafts")>">
+&nbsp;
+-->
   <input type="submit" name="cancel_button" value="<?_("Cancel")>">
 </p>
 <img src="static/newmess3_24x.gif" class="imgedit">  <?DATE:NOW:STR>
 <table width="100%" class="edit_msg_table">
-<TODO: anonym>
 <tr><th><label for="from_id" >  <i><?_("from")></i> </label></th><td colspan="2">
+
+<??("COND:SUBST", 4, "RCPTREQUIRED")>
+<select name="display_name" size=1 id="from_id">
+<?ITERATE("PREF:VALID:EMAIL:NAME", "prefs_section_msg_handle_select")>
+<?!("COND:ROOM:FLAGS:QR_ANONOPT", 3)>
+<option <?%("COND:BSTR", 1, "__ANONYMOUS__", "selected", "")> value="__ANONYMOUS__"><?_("Anonymous")></option>
+<?!("X", 3)>
+</select>
+<??("X", 4)>
+
+<?!("COND:SUBST", 5, "RCPTREQUIRED")>
 <select name="display_name" size=1 id="from_id">
-<?ITERATE("PREF:VALID:EMAIL:NAME", "section_msg_sender_name_select")>
+<?ITERATE("PREF:VALID:EMAIL:NAME", "prefs_section_msg_sender_name_select")>
 <?!("COND:ROOM:FLAGS:QR_ANONOPT", 3)>
 <option <?%("COND:BSTR", 1, "__ANONYMOUS__", "selected", "")> value="__ANONYMOUS__"><?_("Anonymous")></option>
 <?!("X", 3)>
 </select>
 
-<?!("COND:SUBST", 4, "RCPTREQUIRED")>
 <select name="my_email_addr" size=1>
-<?ITERATE("PREF:VALID:EMAIL:ADDR", "section_msg_sender_from_select")>
+<?ITERATE("PREF:VALID:EMAIL:ADDR", "prefs_section_msg_sender_from_select")>
 </select>
 <?!("X", 4)>
 
@@ -56,14 +68,10 @@
 </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>
-<script type="text/javascript">        
- activate_entmsg_autocompleters();     
-
-</script>
 <??("X", 5)>           
 <tr>
   <th><label for="subject_id" > 
@@ -71,38 +79,42 @@
       <??("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")>
-<?!("COND:BSTR", 1, "fwdquote")>
-<br><div align=center><i>
-<?_("--- forwarded message ---")>
-</i></div><br>
-<?MAIL:QUOTETEXT("fwdquote")>
-<?!("X", 1)><?!("COND:BSTR", 2, "replyquote")>
-<br>
-<blockquote>
-<?MAIL:QUOTETEXT("replyquote")>
-</blockquote><br>
-<?!("X", 2)><?!("COND:BSTR", 3, "sig_inserted", "yes")>
-<?!("COND:PREF", 4, "use_sig", "yes")>
-<br>--<br>
-<?PREF:VALUE("signature","H")>
-<?!("X", 4)>
-<?!("X", 3)>
+<?BSTR("msgtext", "X")><?!("COND:BSTR", 1, "fwdquote")>&lt;br /&gt;
+  &lt;div align=center&gt;
+    &lt;i&gt;
+      <?_("--- forwarded message ---")>
+    &lt;/i&gt;
+  &lt;/div&gt;
+  <?MAIL:QUOTETEXT("fwdquote", "X")>
+&lt;br /&gt;<?!("X", 1)><?!("COND:BSTR", 2, "replyquote")>
+&lt;br /&gt;
+    <?MAIL:QUOTETEXT("replyquote", "X")>
+&lt;br /&gt;<?!("X", 2)><?!("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)><?!("COND:ROOM:TYPE_IS", 7, "VIEW_WIKI")><?MAIL:EDITWIKI("X")><?!("X", 7)>
 </textarea>
-<?=("richedit")>
 
 
+
+
+<?=("richedit")>
+
 <div class="attachment buttons">
 <img src="static/diskette_24x.gif" class="imgedit" ><?_("Attachments:")>
 <select name="which_attachment" size=1>
-<?ITERATE("MSG:ATTACHNAMES", "section_attach_select")><TODO>
+<?ITERATE("MSG:ATTACHNAMES", ="edit_message_section_attach_select")>
 </select>
 &nbsp;&nbsp;&nbsp;<?_("Attach file:")>
 <input name="attachfile" class="attachfile" size=16 type="file">
@@ -110,6 +122,11 @@
 
 </div></td></tr></table></form>
 
+<script type="text/javascript">        
+ activate_entmsg_autocompleters();     
+
+</script>
+</div>
 </div>
 </div>
 <?=("addressbook_popup")>