From: Wilfried Goesgens <dothebart@citadel.org>
Date: Sun, 8 Dec 2013 13:45:33 +0000 (+0100)
Subject: Cleanup: move all into the edit/ subfolder
X-Git-Tag: v9.01~167
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=72bd15f387be4fbed3964b3a047d2f5620bc3c1b

Cleanup: move all into the edit/ subfolder
---

diff --git a/webcit/static/t/edit/message.html b/webcit/static/t/edit/message.html
new file mode 100644
index 000000000..116d1c376
--- /dev/null
+++ b/webcit/static/t/edit/message.html
@@ -0,0 +1,214 @@
+<?=("head")>
+<?%("COND:LOGGEDIN", 1, 1, 1, "", ="paging")>
+<?ROOMBANNER>
+<div id="content">
+
+<div id="attachments_form">
+    <div id="loading">
+      <p><img src="static/webcit_icons/throbber.gif" alt=""></p>
+      <p><?_("Loading")></p>
+    </div>
+</div>
+
+<div class="entmsg" id="entmsg"><form name="enterform" accept-charset="UTF-8" enctype="multipart/form-data" method="POST" action="post">
+<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="<?THISROOM:NAME("X")>">
+<input type="hidden" name="references" value="<?BSTR("references")>">
+<input type="hidden" name="page" value="<?BSTR("page")>">
+<input type="hidden" name="submit_action" value="">
+
+<table width="100%" class="edit_msg_table">
+<tr><th><label for="from_id"><i><?_("from")></i></label></th><td>
+
+<??("COND:BSTR", 4, "__RCPTREQUIRED")>
+<select name="display_name" size=1 id="from_id">
+<?ITERATE("PREF:VALID:EMAIL:NAME", ="prefs_section_msg_handle_select")>
+<?!("COND:THISROOM:FLAG:QR", 3, #"QR_ANONOPT")>
+<option <?%("COND:BSTR", 1, "__ANONYMOUS__", "selected", "")> value="__ANONYMOUS__"><?_("Anonymous")></option>
+<?!("X", 3)>
+</select>
+<??("X", 4)>
+
+<?!("COND:BSTR", 5, "__RCPTREQUIRED")>
+<select name="display_name" size=1 id="from_id">
+<?ITERATE("PREF:VALID:EMAIL:NAME", ="prefs_section_msg_sender_name_select")>
+<?!("COND:THISROOM:FLAG:QR", 3, #"QR_ANONOPT")>
+<option <?%("COND:BSTR", 1, "__ANONYMOUS__", "selected", "")> value="__ANONYMOUS__"><?_("Anonymous")></option>
+<?!("X", 3)>
+</select>
+
+<select name="my_email_addr" size=1>
+<?ITERATE("PREF:VALID:EMAIL:ADDR", ="prefs_section_msg_sender_from_select")>
+</select>
+<?!("X", 4)>
+
+ <i><?_("in")></i> <?THISROOM:NAME></td></tr>
+
+<?!("COND:BSTR", 5, "__RCPTREQUIRED")>
+<tr>
+  <th><label for="recp_id"> <?_("To:")></label></th>
+  <td><input autocomplete="off" type="text" name="recp" id="recp_id" value="<?BSTR("recp", "H")>" size=45 maxlength=1000 />
+     <div class="auto_complete" id="recp_name_choices"></div>
+  </td>
+</tr>
+<tr>
+  <th><label for="cc_id"><?_("CC:")></label></th>
+  <td><input autocomplete="off" type="text" name="cc" id="cc_id" value="<?BSTR("cc", "H")>" size=45 maxlength=1000 />
+    <div class="auto_complete" id="cc_name_choices"></div>
+  </td>
+</tr>
+<tr>
+  <th><label for="bcc_id"><?_("BCC:")></label></th>
+  <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>
+<??("X", 5)>		
+<tr>
+  <th><label for="subject_id" > 
+      <?%("COND:BSTR", 6, "__SUBJREQUIRED", 0, _("Subject (optional):"), _("Subject:")>
+  </label></th>
+  <td>
+    <input type="text" name="subject" id="subject_id" value="<?BSTR("subject", "H")>" size=45 maxlength=70>
+  </td>
+</tr>
+</td></tr>
+</table>
+
+<input type="hidden" name="sig_inserted" value="yes">
+
+<textarea name="msgtext" id="msgtext" cols="80" rows="15">
+<?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")>
+
+</form>
+
+<div style="display:none" id="submit-o-matic"><ul>
+<li>
+	<a href="javascript:submit_post('post');">
+		<img src="static/webcit_icons/essen/16x16/check.png" alt=""">
+		<span class="navbar_link">
+		<?!("COND:BSTR", 1, "__RCPTREQUIRED")><?_("Send message")><?!("X", 1)>
+		<??("COND:BSTR", 2, "__RCPTREQUIRED")><?_("Post message")><?!("X", 2)>
+		</span>
+	</a>
+</li>
+<li>
+	<a href="javascript:submit_post('draft');">
+		<img src="static/webcit_icons/essen/16x16/draft.png" alt=""">
+		<span class="navbar_link">
+		<?_("Save to Drafts")>
+		</span>
+	</a>
+</li>
+<li>
+	<a href="javascript:show_attachments_form();">
+		<img src="static/webcit_icons/essen/16x16/attachement.png" alt=""">
+		<span class="navbar_link">
+		<?_("Attachments:")>
+		<span id="num_attachments"><?MSG:NATTACH></span>
+		</span>
+	</a>
+</li>
+<li>
+	<a href="javascript:submit_post('cancel');">
+		<img src="static/webcit_icons/essen/16x16/abort.png" alt="">
+		<span class="navbar_link">
+		<?_("Cancel")>
+		</span>
+	</a>
+</li>
+<?!("COND:BSTR", 1, "__RCPTREQUIRED")><li>
+	<a href="javascript:PopOpenAddressBook('recp_id|<?_("To:")>|cc_id|<?_("CC:")>|bcc_id|<?_("BCC:")>');">
+		<img src="static/webcit_icons/essen/16x16/contact.png" alt=""">
+		<span class="navbar_link">
+		<?_("Contacts")>
+		</span>
+	</a>
+</li><?!("X", 1)>
+</div>
+<script type="text/javascript">	
+
+	$("navbar").innerHTML = $("submit-o-matic").innerHTML;
+	<?!("COND:BSTR", 1, "__RCPTREQUIRED")>
+		activate_entmsg_autocompleters();
+	<?!("X", 1)>
+
+	function submit_post(which_action) {
+		document.enterform.submit_action.value = which_action;
+		document.enterform.submit();
+	}
+
+	function hide_attachments_form() {
+		$('attachments_form').style.display = 'none';
+		update_attachment_count();
+	}
+
+	function show_attachments_form() {
+		$('attachments_form').style.display = 'block';
+
+		p = 'template=edit_message_attachments_pane&r=' + CtdlRandomString();
+		new Ajax.Updater(
+			'attachments_form',
+			'do_template',
+			{
+				method: 'get',
+				parameters: p,
+				evalScripts: true
+			}
+		);
+	}
+
+	function update_attachment_count() {
+		p = 'r=' + CtdlRandomString();
+		new Ajax.Updater(
+			'num_attachments',
+			'show_num_attachments',
+			{
+				method: 'get',
+				parameters: p
+			}
+		);
+	}
+
+	function remove_attachment(which_one) {
+		p = 'which_attachment=' + which_one + '&r=' + CtdlRandomString();
+		new Ajax.Updater(
+			'gonna_upload_this',
+			'remove_attachment',
+			{
+				method: 'get',
+				parameters: p,
+				onComplete: function(){
+					show_attachments_form();
+					update_attachment_count();
+				}
+			}
+		);
+	}
+
+</script>
+</div>
+</div>
+</div>
+<?=("addressbook_popup")>
+
+<?=("trailing")>
diff --git a/webcit/static/t/edit/message/attachments_pane.html b/webcit/static/t/edit/message/attachments_pane.html
new file mode 100644
index 000000000..d4824078c
--- /dev/null
+++ b/webcit/static/t/edit/message/attachments_pane.html
@@ -0,0 +1,23 @@
+<div align="right">
+	<a href="javascript:hide_attachments_form();">
+		<?_("Close window")>&nbsp;<img src="static/webcit_icons/closewindow.gif" border="0"></div>
+	</a>
+	<h2><img src="static/webcit_icons/essen/16x16/attachement.png">&nbsp;<?_("Attachments:")></h2>
+	<ul><?ITERATE("MSG:ATTACHNAMES", ="edit_message_section_attach_select")></ul>
+
+	<iframe id="upload_target" name="upload_target" src="" style="width:0;height:0;border:0">
+		(Hidden iFrame for uploads because ajax cannot handle files)
+	</iframe>
+
+	<form name="upload_attachment_form" id="upload_attachment_form" accept-charset="UTF-8" enctype="multipart/form-data" method="POST" action="upload_attachment" target="upload_target">
+		<input type="hidden" name="nonce" value="<?NONCE>">
+		<div id="gonna_upload_this">
+			<input type="hidden" name="submit_action" value="">
+			<?_("Attach file:")>
+			<input name="attachfile" id="attachfile" class="attachfile" size=40 type="file" onChange="$('gonna_upload_this').style.display='none'; $('upload_throbber').style.display='block'; document.upload_attachment_form.submit(); $('attachfile').value=''; show_attachments_form(); update_attachment_count();">
+		</div>
+
+		<div id="upload_throbber" style="display:none">
+			<?_("Upload")>&nbsp;<img src="static/webcit_icons/throbber.gif" border="0">
+		</div>
+	</form>
diff --git a/webcit/static/t/edit/message/section_attach_select.html b/webcit/static/t/edit/message/section_attach_select.html
new file mode 100644
index 000000000..aa29038cc
--- /dev/null
+++ b/webcit/static/t/edit/message/section_attach_select.html
@@ -0,0 +1,5 @@
+<li>
+	<?MAIL:MIME:FILENAME("X")> (<?MAIL:MIME:CONTENTTYPE>, <?MAIL:MIME:LENGTH> bytes)
+	&nbsp;
+	<a href="javascript:remove_attachment('<?MAIL:MIME:FILENAME("J")>');"><?_("Remove")></a>
+</li>
diff --git a/webcit/static/t/edit_message.html b/webcit/static/t/edit_message.html
deleted file mode 100644
index 116d1c376..000000000
--- a/webcit/static/t/edit_message.html
+++ /dev/null
@@ -1,214 +0,0 @@
-<?=("head")>
-<?%("COND:LOGGEDIN", 1, 1, 1, "", ="paging")>
-<?ROOMBANNER>
-<div id="content">
-
-<div id="attachments_form">
-    <div id="loading">
-      <p><img src="static/webcit_icons/throbber.gif" alt=""></p>
-      <p><?_("Loading")></p>
-    </div>
-</div>
-
-<div class="entmsg" id="entmsg"><form name="enterform" accept-charset="UTF-8" enctype="multipart/form-data" method="POST" action="post">
-<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="<?THISROOM:NAME("X")>">
-<input type="hidden" name="references" value="<?BSTR("references")>">
-<input type="hidden" name="page" value="<?BSTR("page")>">
-<input type="hidden" name="submit_action" value="">
-
-<table width="100%" class="edit_msg_table">
-<tr><th><label for="from_id"><i><?_("from")></i></label></th><td>
-
-<??("COND:BSTR", 4, "__RCPTREQUIRED")>
-<select name="display_name" size=1 id="from_id">
-<?ITERATE("PREF:VALID:EMAIL:NAME", ="prefs_section_msg_handle_select")>
-<?!("COND:THISROOM:FLAG:QR", 3, #"QR_ANONOPT")>
-<option <?%("COND:BSTR", 1, "__ANONYMOUS__", "selected", "")> value="__ANONYMOUS__"><?_("Anonymous")></option>
-<?!("X", 3)>
-</select>
-<??("X", 4)>
-
-<?!("COND:BSTR", 5, "__RCPTREQUIRED")>
-<select name="display_name" size=1 id="from_id">
-<?ITERATE("PREF:VALID:EMAIL:NAME", ="prefs_section_msg_sender_name_select")>
-<?!("COND:THISROOM:FLAG:QR", 3, #"QR_ANONOPT")>
-<option <?%("COND:BSTR", 1, "__ANONYMOUS__", "selected", "")> value="__ANONYMOUS__"><?_("Anonymous")></option>
-<?!("X", 3)>
-</select>
-
-<select name="my_email_addr" size=1>
-<?ITERATE("PREF:VALID:EMAIL:ADDR", ="prefs_section_msg_sender_from_select")>
-</select>
-<?!("X", 4)>
-
- <i><?_("in")></i> <?THISROOM:NAME></td></tr>
-
-<?!("COND:BSTR", 5, "__RCPTREQUIRED")>
-<tr>
-  <th><label for="recp_id"> <?_("To:")></label></th>
-  <td><input autocomplete="off" type="text" name="recp" id="recp_id" value="<?BSTR("recp", "H")>" size=45 maxlength=1000 />
-     <div class="auto_complete" id="recp_name_choices"></div>
-  </td>
-</tr>
-<tr>
-  <th><label for="cc_id"><?_("CC:")></label></th>
-  <td><input autocomplete="off" type="text" name="cc" id="cc_id" value="<?BSTR("cc", "H")>" size=45 maxlength=1000 />
-    <div class="auto_complete" id="cc_name_choices"></div>
-  </td>
-</tr>
-<tr>
-  <th><label for="bcc_id"><?_("BCC:")></label></th>
-  <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>
-<??("X", 5)>		
-<tr>
-  <th><label for="subject_id" > 
-      <?%("COND:BSTR", 6, "__SUBJREQUIRED", 0, _("Subject (optional):"), _("Subject:")>
-  </label></th>
-  <td>
-    <input type="text" name="subject" id="subject_id" value="<?BSTR("subject", "H")>" size=45 maxlength=70>
-  </td>
-</tr>
-</td></tr>
-</table>
-
-<input type="hidden" name="sig_inserted" value="yes">
-
-<textarea name="msgtext" id="msgtext" cols="80" rows="15">
-<?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")>
-
-</form>
-
-<div style="display:none" id="submit-o-matic"><ul>
-<li>
-	<a href="javascript:submit_post('post');">
-		<img src="static/webcit_icons/essen/16x16/check.png" alt=""">
-		<span class="navbar_link">
-		<?!("COND:BSTR", 1, "__RCPTREQUIRED")><?_("Send message")><?!("X", 1)>
-		<??("COND:BSTR", 2, "__RCPTREQUIRED")><?_("Post message")><?!("X", 2)>
-		</span>
-	</a>
-</li>
-<li>
-	<a href="javascript:submit_post('draft');">
-		<img src="static/webcit_icons/essen/16x16/draft.png" alt=""">
-		<span class="navbar_link">
-		<?_("Save to Drafts")>
-		</span>
-	</a>
-</li>
-<li>
-	<a href="javascript:show_attachments_form();">
-		<img src="static/webcit_icons/essen/16x16/attachement.png" alt=""">
-		<span class="navbar_link">
-		<?_("Attachments:")>
-		<span id="num_attachments"><?MSG:NATTACH></span>
-		</span>
-	</a>
-</li>
-<li>
-	<a href="javascript:submit_post('cancel');">
-		<img src="static/webcit_icons/essen/16x16/abort.png" alt="">
-		<span class="navbar_link">
-		<?_("Cancel")>
-		</span>
-	</a>
-</li>
-<?!("COND:BSTR", 1, "__RCPTREQUIRED")><li>
-	<a href="javascript:PopOpenAddressBook('recp_id|<?_("To:")>|cc_id|<?_("CC:")>|bcc_id|<?_("BCC:")>');">
-		<img src="static/webcit_icons/essen/16x16/contact.png" alt=""">
-		<span class="navbar_link">
-		<?_("Contacts")>
-		</span>
-	</a>
-</li><?!("X", 1)>
-</div>
-<script type="text/javascript">	
-
-	$("navbar").innerHTML = $("submit-o-matic").innerHTML;
-	<?!("COND:BSTR", 1, "__RCPTREQUIRED")>
-		activate_entmsg_autocompleters();
-	<?!("X", 1)>
-
-	function submit_post(which_action) {
-		document.enterform.submit_action.value = which_action;
-		document.enterform.submit();
-	}
-
-	function hide_attachments_form() {
-		$('attachments_form').style.display = 'none';
-		update_attachment_count();
-	}
-
-	function show_attachments_form() {
-		$('attachments_form').style.display = 'block';
-
-		p = 'template=edit_message_attachments_pane&r=' + CtdlRandomString();
-		new Ajax.Updater(
-			'attachments_form',
-			'do_template',
-			{
-				method: 'get',
-				parameters: p,
-				evalScripts: true
-			}
-		);
-	}
-
-	function update_attachment_count() {
-		p = 'r=' + CtdlRandomString();
-		new Ajax.Updater(
-			'num_attachments',
-			'show_num_attachments',
-			{
-				method: 'get',
-				parameters: p
-			}
-		);
-	}
-
-	function remove_attachment(which_one) {
-		p = 'which_attachment=' + which_one + '&r=' + CtdlRandomString();
-		new Ajax.Updater(
-			'gonna_upload_this',
-			'remove_attachment',
-			{
-				method: 'get',
-				parameters: p,
-				onComplete: function(){
-					show_attachments_form();
-					update_attachment_count();
-				}
-			}
-		);
-	}
-
-</script>
-</div>
-</div>
-</div>
-<?=("addressbook_popup")>
-
-<?=("trailing")>
diff --git a/webcit/static/t/edit_message/attachments_pane.html b/webcit/static/t/edit_message/attachments_pane.html
deleted file mode 100644
index d4824078c..000000000
--- a/webcit/static/t/edit_message/attachments_pane.html
+++ /dev/null
@@ -1,23 +0,0 @@
-<div align="right">
-	<a href="javascript:hide_attachments_form();">
-		<?_("Close window")>&nbsp;<img src="static/webcit_icons/closewindow.gif" border="0"></div>
-	</a>
-	<h2><img src="static/webcit_icons/essen/16x16/attachement.png">&nbsp;<?_("Attachments:")></h2>
-	<ul><?ITERATE("MSG:ATTACHNAMES", ="edit_message_section_attach_select")></ul>
-
-	<iframe id="upload_target" name="upload_target" src="" style="width:0;height:0;border:0">
-		(Hidden iFrame for uploads because ajax cannot handle files)
-	</iframe>
-
-	<form name="upload_attachment_form" id="upload_attachment_form" accept-charset="UTF-8" enctype="multipart/form-data" method="POST" action="upload_attachment" target="upload_target">
-		<input type="hidden" name="nonce" value="<?NONCE>">
-		<div id="gonna_upload_this">
-			<input type="hidden" name="submit_action" value="">
-			<?_("Attach file:")>
-			<input name="attachfile" id="attachfile" class="attachfile" size=40 type="file" onChange="$('gonna_upload_this').style.display='none'; $('upload_throbber').style.display='block'; document.upload_attachment_form.submit(); $('attachfile').value=''; show_attachments_form(); update_attachment_count();">
-		</div>
-
-		<div id="upload_throbber" style="display:none">
-			<?_("Upload")>&nbsp;<img src="static/webcit_icons/throbber.gif" border="0">
-		</div>
-	</form>
diff --git a/webcit/static/t/edit_message/section_attach_select.html b/webcit/static/t/edit_message/section_attach_select.html
deleted file mode 100644
index aa29038cc..000000000
--- a/webcit/static/t/edit_message/section_attach_select.html
+++ /dev/null
@@ -1,5 +0,0 @@
-<li>
-	<?MAIL:MIME:FILENAME("X")> (<?MAIL:MIME:CONTENTTYPE>, <?MAIL:MIME:LENGTH> bytes)
-	&nbsp;
-	<a href="javascript:remove_attachment('<?MAIL:MIME:FILENAME("J")>');"><?_("Remove")></a>
-</li>