X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fstatic%2Ft%2Froom%2Fedit%2Ftab_listserv.html;h=e0967e9ecae215063d560c582458f2cc71093b6f;hb=08c16cd4d6d989d6511d187f41113040cfeda14b;hp=38579b06edc37e091a8132fdc2d72f9233256392;hpb=64ef1d438d5ee853b598c4e762498e4bc7f1e22f;p=citadel.git

diff --git a/webcit/static/t/room/edit/tab_listserv.html b/webcit/static/t/room/edit/tab_listserv.html
index 38579b06e..e0967e9ec 100644
--- a/webcit/static/t/room/edit/tab_listserv.html
+++ b/webcit/static/t/room/edit/tab_listserv.html
@@ -2,28 +2,34 @@
 	<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>
@@ -51,7 +57,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 +72,67 @@
 						<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">
+		  <td colspan="2">
+		    <?_("Alternative public emailaddresses pointing to this room: ")>
+		  </td>
+		  <?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>