X-Git-Url: https://code.citadel.org/?a=blobdiff_plain;f=webcit%2Fstatic%2Ft%2Froom%2Fedit%2Ftab_config.html;h=872f3ea1942245df5b7c2c92504a2c3c95e4fafb;hb=a64bfc27dd3a05603efa1a729cc1ae4922e7ed17;hp=7518b9d307b472bb743791c7d8d8b7103f8e1fa1;hpb=f4fb5e846c1fdf2016dd2d39b82e4bc11e73d022;p=citadel.git

diff --git a/webcit/static/t/room/edit/tab_config.html b/webcit/static/t/room/edit/tab_config.html
index 7518b9d30..872f3ea19 100644
--- a/webcit/static/t/room/edit/tab_config.html
+++ b/webcit/static/t/room/edit/tab_config.html
@@ -1,61 +1,54 @@
-<div class="tabcontent">
+<?!("COND:THISROOM:EDIT", 1)><div class="tabcontent">
 	<form method="post" action="editroom">
-		<input type="hidden" name="nonce" value="<?NONCE>" />"
+		<input type="hidden" name="nonce" value="<?NONCE>" />
+		<input type="hidden" name="go" value="<?ROOM:INFO:PRINT_NAME("X")>">
 		<ul>   
 			<li>
 				<?_("name of room: ")>
-				<input type="text" name="er_name" value="<?ROOMNAME>" maxlength="127" />
+				<input type="text" name="er_name" value="<?ROOMNAME("X")>" maxlength="127" />
 			</li>
 			<li>
 				<?_("Resides on floor: ")>
-				<select name="er_floor" size="1"
-					<?%("COND:THISROOM:FLAG:QR", 0, #"QR_MAILBOX", 1, 'disabled="disabled" >', ">")>
-					<?!("COND:THISROOM:FLAG:QR", 1, #"QR_MAILBOX")>
-						<?ITERATE("LFLR", ="er_config_tab_room_option_list")>
-                                	<??("X", 1)>
+				<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>
 				<?_("Type of room:")>
 				<ul>
 					<li>
-						<!-- this COND checks against the value of (QR_PRIVATE + QR_MAILBOX)) == 0 -->
 						<input type="radio" name="type" value="public" 
-                                		<?%("COND:THISROOM:FLAG:QR", 2, "14688", 1, 'disabled="disabled" >', ">")>
-                        			onChange="if (this.form.type[0].checked == true) { this.form.er_floor.disabled = false; }" />
+                                		       <?%("COND:THISROOM:FLAG:QR", 3, #"QR_PRIVATE | QR_MAILBOX", 1, "", 'checked="checked" ')>
+                        			       onChange="if (this.form.type[0].checked == true) { this.form.er_floor.disabled = false; }" />
                         			<?_("Public (automatically appears to everyone)")>
 					</li>
 					<li>
 						<input type="radio" name="type" value="hidden" 
-							<??("COND:THISROOM:FLAG:QR", 3, #"QR_PRIVATE")>
-								<?%("COND:THISROOM:FLAG:QR", 4, #"QR_GUESSNAME", 1, 'checked="checked" ', "")> 
-                        				<??("X", 3)>
-						onChange="if (this.form.type[1].checked == true) { this.form.er_floor.disabled = false; }" />
+						       <?%("COND:THISROOM:FLAG:QR", 5, #"QR_GUESSNAME & QR_PRIVATE", 1, 'checked="checked" ', "")> 
+						       onChange="if (this.form.type[1].checked == true) { this.form.er_floor.disabled = false; }" />
                         			<?_("Private - hidden (accessible to anyone who knows its name)")>
                         		</li>
                         		<li>
 						<input type="radio" name="type" value="passworded" 
-							<??("COND:THISROOM:FLAG:QR", 5, #"QR_PRIVATE")>
-									<?%("COND:THISROOM:FLAG:QR", 6, #"QR_PASSWORDED", 1, 'checked="checked" ', "")>
-							<??("X", 5)>
-						onChange="this.form.er_floor.disabled = false; { (this.form.type[2].checked == true) } />
+						       <?%("COND:THISROOM:FLAG:QR", 7, #"QR_PASSWORDED & QR_PRIVATE", 1, 'checked="checked" ', "")>
+						       onChange="this.form.er_floor.disabled = false; { (this.form.type[2].checked == true) }"
+							/>
 						<?_("Private - require password: ")>
-						<input type="text" name="er_password" value="<?PASSWORD("U")>" maxlength="9" />
+						<input type="text" name="er_password" value="<?THISROOM:PASS("U")>" maxlength="9" />
 					</li>
 					<li>
 						<input type="radio" name="type" value="invonly" 
- 							<??("COND:THISROOM:FLAG:QR", 7, #"QR_PRIVATE")>
-								 <??("COND:THISROOM:FLAG:QR", 8, #"QR_GUESSNAME")>
-							                <?%("COND:THISROOM:FLAG:QR", 9, #"QR_PASSWORDED", 1, 'checked="checked" ', "")>
-								<??("X", 8)>
-							<??("X", 7)>
-                         			onChange="if (this.form.type[3].checked == true) { this.form.er_floor.disabled = false; }" />
+						       <??("COND:THISROOM:FLAG:QR", 9, #"QR_PASSWORDED | QR_GUESSNAME")>
+						       <?%("COND:THISROOM:FLAG:QR", 10, #"QR_PRIVATE", 1, 'checked="checked" ', "")>
+						       <??("X", 9)>
+						       onChange="if (this.form.type[3].checked == true) { this.form.er_floor.disabled = false; }" />
 						<?_("Private - invitation only")>            
 					</li>
 					<li>
 						<input type="radio" name="type" value="personal" 
-                        				<?%("COND:THISROOM:FLAG:QR", 10, #"QR_MAILBOX", 1, 'checked="checked" ', "")>
-							onChange="if (this.form.type[4].checked == true) { this.form.er_floor.disabled = true; } />
+                        			       <?%("COND:THISROOM:FLAG:QR", 11, #"QR_MAILBOX", 1, 'checked="checked" ', "")>
+						       onChange="if (this.form.type[4].checked == true) { this.form.er_floor.disabled = true; }"
+							/>
                         			<?_("Personal (mailbox for you only)")>
 					</li>
 					<li>
@@ -65,93 +58,93 @@
 				</ul>
 				<li>
 					<input type="checkbox" name="prefonly" value="yes" 
-					<?%("COND:THISROOM:FLAG:QR", 11, #"QR_PREFONLY", 1, 'checked="checked" ', "")> />     
+					<?%("COND:THISROOM:FLAG:QR", 12, #"QR_PREFONLY", 1, 'checked="checked" ', "")> />     
                         		<?_("Preferred users only")>
 				</li>
 				<li>
 					<input type="checkbox" name="readonly" value="yes" 
-					<?%("COND:THISROOM:FLAG:QR", 12, #"QR_READONLY", 1, 'checked="checked" ', "")>	/>
+					<?%("COND:THISROOM:FLAG:QR", 13, #"QR_READONLY", 1, 'checked="checked" ', "")>	/>
 					<?_("Read-only room")>
 				</li>
 				<li>
 					<input type="checkbox" name="collabdel" value="yes" 
-					<?%("COND:THISROOM:FLAG:QR2", 13, #"QR2_COLLABDEL", 1, 'checked="checked" ', "")> />
+					<?%("COND:THISROOM:FLAG:QR2", 14, #"QR2_COLLABDEL", 1, 'checked="checked" ', "")> />
 					<?_("All users allowed to post may also delete messages")>
 				</li>
 				<li>
 					<input type="checkbox" name="directory" value="yes" 
-					<?%("COND:THISROOM:FLAG:QR", 14, #"QR_DIRECTORY", 1, 'checked="checked" ', "")>  />
+					<?%("COND:THISROOM:FLAG:QR", 15, #"QR_DIRECTORY", 1, 'checked="checked" ', "")>  />
 					<?_("File directory room")>
-				</li>
+				
 				<ul>
 					<li>
 						<?_("Directory name: ")>
-						<input type="text" name="er_dirname" value="<?DIRNAME>" maxlength="14" />
+						<input type="text" name="er_dirname" value="<?THISROOM:DIRECTORY("X")>" maxlength="14" />
                         		</li>
 					<li>
 						<input type="checkbox" name="ulallowed" value="yes" 
-						<?%("COND:THISROOM:FLAG:QR", 15, #"QR_UPLOAD", 1, 'checked="checked" ', "")>  />
+						<?%("COND:THISROOM:FLAG:QR", 16, #"QR_UPLOAD", 1, 'checked="checked" ', "")>  />
 						<?_("Uploading allowed")>
 					</li>
 					<li>
 						<input type="checkbox" name="dlallowed" value="yes" 
-						<?%("COND:THISROOM:FLAG:QR", 16, #"QR_DOWNLOAD", 1, 'checked="checked" ', "")>  />
+						<?%("COND:THISROOM:FLAG:QR", 17, #"QR_DOWNLOAD", 1, 'checked="checked" ', "")>  />
 						<?_("Downloading allowed")>
 					</li>
 					<li>
 						<input type="checkbox" name="visdir" value="yes" 
-						<?%("COND:THISROOM:FLAG:QR", 17, #"QR_VISDIR", 1, 'checked="checked" ', "")>  />
+						<?%("COND:THISROOM:FLAG:QR", 18, #"QR_VISDIR", 1, 'checked="checked" ', "")>  />
 						<?_("Visible directory")>
 					</li>
-			</ul>
+				  </ul></li>
                        
 			<li>
 				<input type="checkbox" name="network" value="yes" 
-				<?%("COND:THISROOM:FLAG:QR", 18, #"QR_NETWORK", 1, 'checked="checked" ', "")>  />
+				<?%("COND:THISROOM:FLAG:QR", 19, #"QR_NETWORK", 1, 'checked="checked" ', "")>  />
 				<?_("Network shared room")>
 			</li>                         
 			<li>
 				<input type="checkbox" name="permanent" value="yes" 
-				<?%("COND:THISROOM:FLAG:QR", 19, #"QR_PERMANENT", 1, 'checked="checked" ', "")>  />
+				<?%("COND:THISROOM:FLAG:QR", 20, #"QR_PERMANENT", 1, 'checked="checked" ', "")>  />
 				<?_("Permanent (does not auto-purge)")>
 			</li>
 			<li>
 				<input type="checkbox" name="subjectreq" value="yes" 
-				<?%("COND:THISROOM:FLAG:QR2", 20, #"QR2_SUBJECTREQ", 1, 'checked="checked" ', "")>  />
+				<?%("COND:THISROOM:FLAG:QR2", 21, #"QR2_SUBJECTREQ", 1, 'checked="checked" ', "")>  />
 				<?_("Subject Required (Force users to specify a message subject)")>
 			</li>
 			<li>
                         	<?_("Anonymous messages")>
-			</li>
                         <ul>
 				<li>
 					<input type="radio" name="anon" value="no" 
-					<??("COND:THISROOM:FLAG:QR", 21, #"QR_ANONONLY")>
-						<?%("COND:THISROOM:FLAG:QR", 22, #"QR_ANONOPT", 1, 'checked="checked" ', "")>
-					<??("X", 21)> />
+					       <?%("COND:THISROOM:FLAG:QR", 23, #"QR_ANONOPT & QR_ANONONLY", 1, "", 'checked="checked" ')>
+					       >
 					<?_("No anonymous messages")>
 				</li>
                         	<li>
 					<input type="radio" name="anon" value="anononly" 
-					<?%("COND:THISROOM:FLAG:QR", 23, #"QR_ANONONLY", 1, 'checked="checked" ', "")> />
+					<?%("COND:THISROOM:FLAG:QR", 24, #"QR_ANONONLY", 1, 'checked="checked" ', "")> />
 					<?_("All messages are anonymous")>
 				</li>
 				<li>
 					<input type="radio" name="anon" value="anon2" 
-					<?%("COND:THISROOM:FLAG:QR", 24, #"QR_ANONOPT", 1, 'checked="checked" ', "")> />
+					<?%("COND:THISROOM:FLAG:QR", 25, #"QR_ANONOPT", 1, 'checked="checked" ', "")> />
 					<?_("Prompt user when entering messages")>
 				</li>
-			</ul>
+			</ul></li>
 			<li>
 				<?_("Room aide: ")>
-                        	 <?%("COND:THISROOM:GETA", 25, ROOMAIDE, "<em><?GETA></em>", '<input type="text" name="er_roomaide" value="<?ROOMAIDE>" maxlength="25" /'>
+				<input type="text" name="er_roomaide" value="<?THISROOM:AIDE("U")>" maxlength="25" /'>
 			</li>
 	</ul>
 
 	<center>
-		<input type="hidden" name="tab" value="config" />
+		<input type="hidden" name="last_tabsel" value="<?TAB:N>" />
 		<input type="submit" name="ok_button" value="<?_("Save changes")>" />
 		&nbsp;
 		<input type="submit" name="cancel_button" value="<?_("Cancel")>" />
 	</center>
+	</form>
 </div>
+<?!("X", 1)><??("COND:THISROOM:EDIT", 20)><div class="tabcontent"><?_("Higher access is required to access this function.")></div><??("X", 20)>