* fix several typos

* work on the expire tab

diff --git a/webcit/static/t/iconbar.html b/webcit/static/t/iconbar.html
index 316dd11dda12c9974612631422374977d85f915d..65d7d3a9d3d991fe1871ffca8448f3ba19e0dec2 100644 (file)
--- 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 e1175b16af292a8df7a0d4e3eca7c894c09653a9..896c7ca14b09f2bdd59b95c78eb27e0adfd38363 100644 (file)
--- 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 348056ef907a65efd72261899e46c59af4d13acf..c0328b63006e933c69cf35b21b9947b6cbcb0a49 100644 (file)
--- 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 cbee5877d6c10941c61ac62378123c80c9ea7de2..b90362a3add8ea45198f2bf7d920e200d2c978de 100644 (file)
--- 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 48b96947f74ad9daf468830f99e25e6b1929cb3b..7d4b2244c159dc0d92a8ab45dbaceea26c7a56cb 100644 (file)
--- 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>