From: Wilfried Göesgens <willi@citadel.org>
Date: Thu, 5 Aug 2010 21:06:53 +0000 (+0000)
Subject: * fix room-edit-tabs to be more tidy  conformant.
X-Git-Tag: v8.01~962
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=3af9ff82417a98e8f07a222a8a276d331515bcf9

* fix room-edit-tabs to be more tidy  conformant.
---

diff --git a/webcit/static/t/room/edit/er_config_tab_room_option_list.html b/webcit/static/t/room/edit/er_config_tab_room_option_list.html
index 9a58264d3..daa7a88de 100644
--- a/webcit/static/t/room/edit/er_config_tab_room_option_list.html
+++ b/webcit/static/t/room/edit/er_config_tab_room_option_list.html
@@ -1 +1 @@
-<option <?%("COND:FLOOR:ISSUBROOM", 1, 1, "<?FLOOR:NAME>", 'selected="selected"', "")> value="<?FLOOR:ID>"><?FLOOR:NAME></option> /////TODO: FLOOR:NAME???
+<option <?%("COND:FLOOR:ISSUBROOM", 1, 1, "<?FLOOR:NAME>", 'selected="selected"', "")> value="<?FLOOR:ID>"><?FLOOR:NAME("X")></option>
diff --git a/webcit/static/t/room/edit/tab_config.html b/webcit/static/t/room/edit/tab_config.html
index c0328b630..7baaf925c 100644
--- a/webcit/static/t/room/edit/tab_config.html
+++ b/webcit/static/t/room/edit/tab_config.html
@@ -8,11 +8,8 @@
 			</li>
 			<li>
 				<?_("Resides on floor: ")>
-				<select name="er_floor" size="1"
-					<?%("COND:THISROOM:FLAG:QR", 1, #"QR_MAILBOX", 1, 'disabled="disabled" >', ">")>
-					<?!("COND:THISROOM:FLAG:QR", 2, #"QR_MAILBOX")>
-						<?ITERATE("LFLR", ="room_edit_er_config_tab_room_option_list")>
-                                	<??("X", 2)>
+				<select name="er_floor" size="1" <?%("COND:THISROOM:FLAG:QR", 1, #"QR_MAILBOX", 1, 'disabled="disabled" >', ">")>
+<??("COND:THISROOM:FLAG:QR", 2, #"QR_MAILBOX")>	<?ITERATE("LFLR", ="room_edit_er_config_tab_room_option_list")><??("X", 2)>
 				</select>
                         </li>
 			<li>
@@ -84,7 +81,7 @@
 					<input type="checkbox" name="directory" value="yes" 
 					<?%("COND:THISROOM:FLAG:QR", 15, #"QR_DIRECTORY", 1, 'checked="checked" ', "")>  />
 					<?_("File directory room")>
-				</li>
+				
 				<ul>
 					<li>
 						<?_("Directory name: ")>
@@ -105,7 +102,7 @@
 						<?%("COND:THISROOM:FLAG:QR", 18, #"QR_VISDIR", 1, 'checked="checked" ', "")>  />
 						<?_("Visible directory")>
 					</li>
-			</ul>
+				  </ul></li>
                        
 			<li>
 				<input type="checkbox" name="network" value="yes" 
@@ -124,7 +121,6 @@
 			</li>
 			<li>
                         	<?_("Anonymous messages")>
-			</li>
                         <ul>
 				<li>
 					<input type="radio" name="anon" value="no" 
@@ -143,7 +139,7 @@
 					<?%("COND:THISROOM:FLAG:QR", 25, #"QR_ANONOPT", 1, 'checked="checked" ', "")> />
 					<?_("Prompt user when entering messages")>
 				</li>
-			</ul>
+			</ul></li>
 			<li>
 				<?_("Room aide: ")>
 				<input type="text" name="er_roomaide" value="<?THISROOM:AIDE("U")>" maxlength="25" /'>
diff --git a/webcit/static/t/room/edit/tab_feed.html b/webcit/static/t/room/edit/tab_feed.html
index 7d4b2244c..1d61afdb6 100644
--- a/webcit/static/t/room/edit/tab_feed.html
+++ b/webcit/static/t/room/edit/tab_feed.html
@@ -1,6 +1,12 @@
 <div class="tabcontent">
 	<i><?_("Retrieve messages from these remote POP3 accounts and store them in this room:")></i>
 	<br />
+	<form method="post" action="netedit">
+<p>
+	<input type="hidden" name="tab" value="feeds" />
+	<input type="hidden" name="prefix" value="pop3client|" />
+	<input type="hidden" name="nonce" value="<?NONCE>">
+</p>
 	<table class="altern" border="0" cellpadding="5">
 		<tr class="even">
 			<th><?_("Remote host")></th>
@@ -11,11 +17,7 @@
 			<th>&nbsp;</th>
 		</tr>
 		<?ITERATE("ITERATE:THISROOM:GNET", ="room_edit_pop3client_removal", 0, 0, -1, #"pop3client")>
-		<form method="post" action="netedit">
 			<tr>
-				<input type="hidden" name="tab" value="feeds" />
-				<input type="hidden" name="prefix" value="pop3client|" />
-				<input type="hidden" name="nonce" value="<?NONCE>">
 				<td><input type="text" id="add_as_pop3host" name="line_pop3host" /></td>
 				<td><input type="text" id="add_as_pop3user" name="line_pop3user" /></td>
 				<td><input type="password" id="add_as_pop3pass" name="line_pop3pass" /></td>
@@ -23,11 +25,17 @@
 				<td><input type="text" id="add_as_pop3int" name="line_pop3int" maxlength="5" /></td>
 				<td><input type="submit" name="add_button" value="<?_("Add")>" /></td>
 			</tr>
-		</form>
 	</table>
+	</form>
 	<hr>
 	<i><?_("Fetch the following RSS feeds and store them in this room:")></i>
 	<br />
+	<form method="post" action="netedit">
+<p>
+	<input type="hidden" name="tab" value="feeds" />
+	<input type="hidden" name="prefix" value="rssclient|" />
+	<input type="hidden" name="nonce" value="<?NONCE>" />
+</p>
 	<table class="altern" border="0" cellpadding="5">
 		<tr class="even">
 			<th>
@@ -37,15 +45,11 @@
 			<th></th>
 		</tr>
 		<?ITERATE("ITERATE:THISROOM:GNET", ="room_edit_rssclient_removal", 0, 0, -1, #"rssclient")>
-		<form method="post" action="netedit">
 			<tr>
-				<input type="hidden" name="tab" value="feeds" />
-				<input type="hidden" name="prefix" value="rssclient|" />
-				<input type="hidden" name="nonce" value="<?NONCE>" />
 				<td><input type="text" id="add_as_rssclient" size="72" maxlength="256" name="line_rsshost" /></td>
 				<td><input type="submit" name="add_button" value="<?_("Add")>" /></td>
 			</tr>
-		</form>
 	</table>
+	</form>
 </div>
 
diff --git a/webcit/static/t/room/edit/tab_listserv.html b/webcit/static/t/room/edit/tab_listserv.html
index fa770d5ca..014b4cd3f 100644
--- a/webcit/static/t/room/edit/tab_listserv.html
+++ b/webcit/static/t/room/edit/tab_listserv.html
@@ -6,11 +6,13 @@
 			<?ITERATE("ITERATE:THISROOM:GNET", ="room_edit_listrecp_removal", 0, 0, -1, #"listrecp")>
 			<br />
 			<form method="post" action="netedit">
+			  <p>
 				<input type="hidden" name="tab" value="listserv" />
 				<input type="hidden" name="prefix" value="listrecp|" />
 				<input type="hidden" name="nonce" value="<?NONCE>" />
 				<input type="text" id="add_as_listrecp" name="line" />
 				<input type="submit" name="add_button" value="<?_("Add")>" />
+			  </p>
 			</form>
 			</td>
 			<td valign="top">
@@ -18,11 +20,13 @@
 			<?ITERATE("ITERATE:THISROOM:GNET", ="room_edit_digestrecp_removal", 0, 0, -1, #"digestrecp")>
 			<br />
 			<form method="post" action="netedit">
+			  <p>
 				<input type="hidden" name="tab" value="listserv" />
 				<input type="hidden" name="prefix" value="digestrecp|" />
 				<input type="hidden" name="nonce" value="<?NONCE>">
 				<input type="text" id="add_as_digestrecp" name="line">
 				<input type="submit" name="add_button" value="<?_("Add")>">
+			  </p>
 			</form>
 			</td></tr>
 		</table>