X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fstatic%2Ft%2Froom%2Fedit%2Ftab_listserv.html;h=d3ec69b861b2854111aaf0fa4b36253125d8a763;hb=3e11c18430552bb1f5dc462848d01c3a36f12c1c;hp=62798ed313783a42c4f5b224dfdf89e128505622;hpb=58873f11d3e6a08336b03b171e250a6ca067bb06;p=citadel.git

diff --git a/webcit/static/t/room/edit/tab_listserv.html b/webcit/static/t/room/edit/tab_listserv.html
old mode 100755
new mode 100644
index 62798ed31..d3ec69b86
--- a/webcit/static/t/room/edit/tab_listserv.html
+++ b/webcit/static/t/room/edit/tab_listserv.html
@@ -2,28 +2,55 @@
 	<center>
 		<table border="0" width="100%" cellpadding="5">
 			<tr><td valign="top">
-			<?_("<i>The contents of this room are being mailed <b>as individual messages</b> to the following list recipients:</i><br><br>")>
-			<?ITERATE("ITERATE:THISROOM:GNET", ="room_edit_listrecp_removal", 0, 0, -1, #"listrecp")>
+			    <table class="altern">
+			      <tr><th><?_("<i>The contents of this room are being mailed <b>as individual messages</b> to the following list recipients:</i><br><br>")></th></tr>
+			      <?ITERATE("ITERATE:THISROOM:GNET", ="room_edit_listrecp_removal", 0, 0, -1, #"listrecp")>
+			    </table>
 			<br>
 			<form method="post" action="netedit">
 			  <p>
 			        <input type="hidden" name="last_tabsel" value="<?TAB:N>">
 				<input type="hidden" name="prefix" value="listrecp|">
 				<input type="hidden" name="nonce" value="<?NONCE>">
+				<input type="hidden" name="go" value="<?THISROOM:NAME("X")>">
 				<input type="text" id="add_as_listrecp" name="line">
 				<input type="submit" name="add_button" value="<?_("Add")>">
 			  </p>
 			</form>
 			</td>
 			<td valign="top">
-			<?_("<i>The contents of this room are being mailed <b>in digest form</b> to the following list recipients:</i><br><br>")>
-			<?ITERATE("ITERATE:THISROOM:GNET", ="room_edit_digestrecp_removal", 0, 0, -1, #"digestrecp")>
+			    <table class="altern">
+			      <tr><th><?_("<i>The contents of this room are being mailed <b>in digest form</b> to the following list recipients:</i><br><br>")></th></tr>
+			      <?ITERATE("ITERATE:THISROOM:GNET", ="room_edit_digestrecp_removal", 0, 0, -1, #"digestrecp")>
+			    </table>
 			<br>
 			<form method="post" action="netedit">
 			  <p>
 			        <input type="hidden" name="last_tabsel" value="<?TAB:N>">
 				<input type="hidden" name="prefix" value="digestrecp|">
 				<input type="hidden" name="nonce" value="<?NONCE>">
+				<input type="hidden" name="go" value="<?THISROOM:NAME("X")>">
+				<input type="text" id="add_as_digestrecp" name="line">
+				<input type="submit" name="add_button" value="<?_("Add")>">
+			  </p>
+			</form>
+			</td></tr>
+		</table>
+
+		<table border="0" width="100%" cellpadding="5">
+			<td valign="top">
+			    <table class="altern">
+			      <tr><th><?_("Posts to this room will be sent to these mailing lists")></th></tr>
+			      <tr><td><?_("All messages posted / mailed into this room will be sent to these email addresses. If you link this with mailinglist subscriptions, make shure the default sender address below matches the subscribed address. You will see your messages twice once the mailinglist sends it back to you.")></td></tr>
+			      <?ITERATE("ITERATE:THISROOM:GNET", ="room_edit_participate_removal", 0, 0, -1, #"participate")>
+			    </table>
+			<br>
+			<form method="post" action="netedit">
+			  <p>
+			        <input type="hidden" name="last_tabsel" value="<?TAB:N>">
+				<input type="hidden" name="prefix" value="participate|">
+				<input type="hidden" name="nonce" value="<?NONCE>">
+				<input type="hidden" name="go" value="<?THISROOM:NAME("X")>">
 				<input type="text" id="add_as_digestrecp" name="line">
 				<input type="submit" name="add_button" value="<?_("Add")>">
 			  </p>
@@ -35,7 +62,7 @@
 		<div align="right">
 			<a href="javascript:PopOpenAddressBook('add_as_listrecp|<?_("List")>|add_as_digestrecp|<?_("Digest")>')"
 			title="<?_("Add recipients from Contacts or other address books")>">
-			<img align="middle" border="0" width="24" height="24" alt="<?_("Addressbook Popup")>" src="static/icons/essen/16x16/contact.png">
+			<img align="middle" border="0" width="24" height="24" alt="<?_("Addressbook Popup")>" src="static/webcit_icons/essen/16x16/contact.png">
 			&nbsp;<?_("Add recipients from Contacts or other address books")></a>
 		</div>
 		<!-- Pop open an address book - end -->
@@ -51,7 +78,7 @@
 		
 				<!-- Moderated List? -->
 				<tr>
-					<td><?_("Room post publication needs Aide permission.")></td>
+					<td><?_("Room post publication needs Admin permission.")></td>
 					<td><input type="checkbox" name="QR2_Moderated" value="yes" <?%("COND:THISROOM:FLAG:QR2", 20, #"QR2_MODERATED", 1, 'checked="checked" ', "")>></td>
 				</tr>
 				<!-- Self Service subscription? -->
@@ -66,15 +93,69 @@
 						<tt><?%("COND:IS_HTTPS", 3, 1, 0, "https", "http")>://<?SERV:FQDN>/listsub</tt>
 					</td>
 				</tr>
-
 				<tr>
-					<td colspan="2" align="center">
-					        <input type="hidden" name="last_tabsel" value="<?TAB:N>">
-						<input type="hidden" name="nonce" value="<?NONCE>">
-						<input type="submit" name="add_button" value="<?_("Save changes")>">
-					</td>
+				  <td colspan="2" align="center">
+				    <input type="hidden" name="last_tabsel" value="<?TAB:N>">
+				    <input type="hidden" name="nonce" value="<?NONCE>">
+				    <input type="hidden" name="go" value="<?THISROOM:NAME("X")>">
+				    <input type="submit" name="add_button" value="<?_("Save changes")>">
+				  </td>
 				</tr>
 			</table>
 		</form>
+
+		<table class="altern">
+		  <tr>
+		  <td colspan="2">
+		    <?_("Which from address should be used: ")>
+		  </td>
+		  </tr>
+		  <tr>
+		    <td colspan="2">
+		      <form method="post" action="netedit">
+			<p>
+			  <input type="hidden" name="last_tabsel" value="<?TAB:N>">
+			  <input type="hidden" name="alias" value="room_<?THISROOM:NAME("X")>">
+			  <input type="hidden" name="nonce" value="<?NONCE>">
+			  <input type="hidden" name="go" value="<?THISROOM:NAME("X")>">
+			  <input type="hidden" name="prefix" value="roommailalias|">
+			  <select size="1" name="default_aliasdomain">
+				  <option value=""<?%("COND:THISROOM:ISALIAS:CONTEXTSTR", 1, #"eNotSet", "", ' selected="selected"', "")>><?_("none (not advised)")></option>
+		  <?ITERATE("ITERATE:THISROOM:POSSIBLE:MALIAS", ="room_edit_select_alias", 0, 0, -1, "")>
+			  </select>
+			  <input type="submit" name="add_button" value="<?_("Set")>">
+			</p>
+		      </form>
+		    </td>
+		  </tr>
+		</table>
+		<table class="altern">
+		  <tr>
+		  <td colspan="2">
+		    <?_("Alternative public emailaddresses pointing to this room: ")>
+		  </td>
+		  </tr>
+		  <?ITERATE("ITERATE:THISROOM:MALIAS", ="room_edit_alias_removal", 0, 0, -1, "")>
+		  <tr>
+		    <td colspan="2">
+		      <form method="post" action="netedit">
+			<p>
+			  <input type="hidden" name="last_tabsel" value="<?TAB:N>">
+			  <input type="hidden" name="alias" value="room_<?THISROOM:NAME("X")>">
+			  <input type="hidden" name="nonce" value="<?NONCE>">
+			  <input type="hidden" name="go" value="<?THISROOM:NAME("X")>">
+			  <input type="text" id="prefix" name="prefix">
+			  @ 
+			  <select size="1" name="aliasdomain">
+				  <option value=""><?_("All Domains")></option>
+				  <?ITERATE("ITERATE:VALID:DOMAINNAMES", ="room_edit_alias_domainname", 0, 0, -1, "")>
+			  </select>
+			  <input type="submit" name="add_button" value="<?_("Add")>">
+			</p>
+		      </form>
+		    </td>
+		  </tr>
+		</table>
+		
 	</center>
 </div>