* When editing a wiki page, insert the existing version of the page into the editor...

[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 201fc7d75e3901e5bccf3362c727f02e7df4cb81..81a29406b41ab0d7fba16783d5a3bc56a6085888 100644 (file)
--- a/webcit/static/t/edit_message.html
+++ b/webcit/static/t/edit_message.html
@@ -1,5 +1,5 @@
 <?=("head")>
-<?=("important_msg")>
+<?=("important_msg")><?%("COND:LOGGEDIN", 1, 1, 1, "", ="paging")>
 <?ROOMBANNER>
 <div id="content">
 <div class="fix_scrollbar_bug message "><form enctype="multipart/form-data" method="POST" accept-charset="UTF-8" action="post" name="enterform">
@@ -8,11 +8,16 @@
 <input type="hidden" name="nonce" value="<?NONCE>">
 <input type="hidden" name="force_room" value="<?ROOMNAME("X")>">
 <input type="hidden" name="references" value="<?BSTR("references")>">
+<input type="hidden" name="wikipage" value="<?BSTR("wikipage")>">
 
 <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>
@@ -63,7 +68,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>
@@ -97,17 +102,24 @@
     <?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;p&gt;--&nbsp;&lt;br&gt;
-    <?PREF:VALUE("signature","H")>
-    &lt;/p&gt;
-  <?!("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)>
+<?!("COND:ROOM:TYPE_IS", 7, "VIEW_WIKI")>
+<?MAIL:EDITWIKI("X")>
+<?!("X", 7)>
 </textarea>
 <?=("richedit")>
 
-
 <div class="attachment buttons">
 <img src="static/diskette_24x.gif" class="imgedit" ><?_("Attachments:")>
 <select name="which_attachment" size=1>