From: Wilfried Göesgens <willi@citadel.org>
Date: Sun, 1 Aug 2010 22:27:56 +0000 (+0000)
Subject: * fix several typos
X-Git-Tag: v8.01~971
X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=d061ce0709cd28f2355e59aeaf2714b3388ba9c3

* fix several typos
* work on the expire tab
---

diff --git a/webcit/static/t/iconbar.html b/webcit/static/t/iconbar.html
index 316dd11dd..65d7d3a9d 100644
--- a/webcit/static/t/iconbar.html
+++ b/webcit/static/t/iconbar.html
@@ -71,7 +71,7 @@
 </ul>
 </div>
 <div id="ib_logoff" class="ib_button">
-<a class="ib_button_link" href="termquit" onclick="return confirm('<?_("Log off now?")>');"title="<?_("Log off")>"><span><?_("Log off")></span></a>
+<a class="ib_button_link" href="termquit" onclick="return confirm('<?_("Log off now?")>');" title="<?_("Log off")>"><span><?_("Log off")></span></a>
 </div>
 <div id="customize" class="iconbar_text">
   <span><a href="do_template?template=iconbar_edit"><?_("customize this menu")></a></span>
diff --git a/webcit/static/t/room/edit/tab_admin.html b/webcit/static/t/room/edit/tab_admin.html
index e1175b16a..896c7ca14 100644
--- a/webcit/static/t/room/edit/tab_admin.html
+++ b/webcit/static/t/room/edit/tab_admin.html
@@ -1,7 +1,7 @@
 <div class="tabcontent">
 	<ul>
 		<li>
-			<a href="delete_room" onClick="return confirm('<?_("Are you sure you want to delete this room?")>'")>
+			<a href="delete_room" onClick="return confirm('<?_("Are you sure you want to delete this room?")>')">
 				<?_("Delete this room")>
 			</a>
 		</li>
diff --git a/webcit/static/t/room/edit/tab_config.html b/webcit/static/t/room/edit/tab_config.html
index 348056ef9..c0328b630 100644
--- a/webcit/static/t/room/edit/tab_config.html
+++ b/webcit/static/t/room/edit/tab_config.html
@@ -1,10 +1,10 @@
 <div class="tabcontent">
 	<form method="post" action="editroom">
-		<input type="hidden" name="nonce" value="<?NONCE>" />"
+		<input type="hidden" name="nonce" value="<?NONCE>" />
 		<ul>   
 			<li>
 				<?_("name of room: ")>
-				<input type="text" name="er_name" value="<?ROOMNAME>" maxlength="127" />
+				<input type="text" name="er_name" value="<?ROOMNAME("U")>" maxlength="127" />
 			</li>
 			<li>
 				<?_("Resides on floor: ")>
diff --git a/webcit/static/t/room/edit/tab_expire.html b/webcit/static/t/room/edit/tab_expire.html
index cbee5877d..b90362a3a 100644
--- a/webcit/static/t/room/edit/tab_expire.html
+++ b/webcit/static/t/room/edit/tab_expire.html
@@ -10,8 +10,7 @@
 					<?ROOMNAME("X")>
 				</td>
 				<td>
-					<input type="radio" name="roompolicy" value="0" %s />&nbsp;
-						((roompolicy == 0) ? "CHECKED" : "") );
+					<input type="radio" name="roompolicy" value="0" <?%("COND:EXPIRE:MODE", 1, #"roompolicy", #"EXPIRE_NEXTLEVEL" , 'checked="checked"',"")>/>&nbsp;
 					<?_("Use the default policy for this floor")>&nbsp;
 					<br />
 					<input type="radio" name="roompolicy" value="1" <?%("COND:EXPIRE:MODE", 1, #"mailboxespolicy", #"EXPIRE_MANUAL", 'checked="checked"',"")> />&nbsp;
@@ -28,37 +27,34 @@
 				</td>
 			</tr>
 	
-			<??("COND:AIDE", 2 ...)>	if (WC->axlevel >= 6) {
+			<??("COND:AIDE", 2)>
 			<tr>
 				<td colspan="2"><hr /></td>
 			</tr>
 			<tr>
 				<td>
 					<?_("Message expire policy for this floor")>
-					<br />(
-						escputs(floorlist[WC->CurRoom.floorid]);
+					<br />
+					<?ROOM:INFO:FLOOR:NAME("X")>
 				</td>
 				<td>
-					<input type="radio" name="floorpolicy" value="0" %s>",
-						((floorpolicy == 0) ? "CHECKED" : "") );
+					<input type="radio" name="floorpolicy" value="0" <?%("COND:EXPIRE:MODE", 1, #"floorpolicy", #"EXPIRE_NEXTLEVEL" , 'checked="checked"',"")>>nbsp;
 					<?_("Use the system default")>
 					<br />
-					<input type="radio" name="floorpolicy" value="1" %s>",
-						((floorpolicy == 1) ? "CHECKED" : "") );
+					<input type="radio" name="floorpolicy" value="1" <?%("COND:EXPIRE:MODE", 1, #"floorpolicy", #"EXPIRE_MANUAL", 'checked="checked"',"")> />&nbsp;
 					<?_("Never automatically expire messages")>
 					<br />
-					<input type="radio" name="floorpolicy" value="2" %s>",
-						((floorpolicy == 2) ? "CHECKED" : "") );
+					<input type="radio" name="floorpolicy" value="2" <?%("COND:EXPIRE:MODE", 2, #"floorpolicy", #"EXPIRE_NUMMSGS", 'checked="checked"', "")> />&nbsp;
 					<?_("Expire by message count")>
 					<br />
-					<input type="radio" name="floorpolicy" value="3" %s>",
-						((floorpolicy == 3) ? "CHECKED" : "") );
+					<input type="radio" name="floorpolicy" value="3" <?%("COND:EXPIRE:MODE", 1, #"floorpolicy", #"EXPIRE_AGE", 'checked="checked"', "")> />&nbsp;
 					<?_("Expire by message age")>
 					<br />
 					<?_("Number of messages or days: ")>
-					<input type="text" name="floorvalue" MAXLENGTH="5" value="%d">",
-						floorvalue);
-			<("X", 2)>	
+					<input type="text" name="floorvalue" MAXLENGTH="5" value="<?EXPIRE:VALUE(#"floorpolicy", #"EXPIRE_NUMMSGS")>">
+					</td>
+				</tr>
+			<??("X", 2)>	
 			<tr>
 				<td colspan="2">
 					<hr />
diff --git a/webcit/static/t/room/edit/tab_feed.html b/webcit/static/t/room/edit/tab_feed.html
index 48b96947f..7d4b2244c 100644
--- a/webcit/static/t/room/edit/tab_feed.html
+++ b/webcit/static/t/room/edit/tab_feed.html
@@ -42,7 +42,7 @@
 				<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_pop3host" size="72" "maxlength="256" name="line_pop3host" /></td>
+				<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>