* fix various tiny flags, room-config is working flawlessly now.

[citadel.git] / webcit / static / t / room / edit / tab_config.html

diff --git a/webcit/static/t/room/edit/tab_config.html b/webcit/static/t/room/edit/tab_config.html
index 1435501175e6cad244b9e0d395393c5325e4aa9f..44c8c04fbdf37f017e0e61a7bcee03a5e4e2db95 100644 (file)
--- a/webcit/static/t/room/edit/tab_config.html
+++ b/webcit/static/t/room/edit/tab_config.html
@@ -9,14 +9,13 @@
                        <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)>
+                                 <??("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", 3, #"QR_PRIVATE | QR_MAILBOX", 1, 'disabled="disabled" ', "")>
                                                       onChange="if (this.form.type[0].checked == true) { this.form.er_floor.disabled = false; }" />
@@ -38,7 +37,9 @@
                                        </li>
                                        <li>
                                                <input type="radio" name="type" value="invonly" 
-                                                      <?%("COND:THISROOM:FLAG:QR", 10, #"QR_PASSWORDED & QR_PRIVATE & QR_GUESSNAME", 1, 'checked="checked" ', "")>
+                                                      <??("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>
@@ -77,7 +78,7 @@
                                <ul>
                                        <li>
                                                <?_("Directory name: ")>
-                                               <input type="text" name="er_dirname" value="<?THISROOM:DIRECTORY("U")>" maxlength="14" />
+                                               <input type="text" name="er_dirname" value="<?THISROOM:DIRECTORY("X")>" maxlength="14" />
                                        </li>
                                        <li>
                                                <input type="checkbox" name="ulallowed" value="yes" 
@@ -116,9 +117,8 @@
                         <ul>
                                <li>
                                        <input type="radio" name="anon" value="no" 
-                                       <??("COND:THISROOM:FLAG:QR", 22, #"QR_ANONONLY")>
-                                               <?%("COND:THISROOM:FLAG:QR", 23, #"QR_ANONOPT", 1, 'checked="checked" ', "")>
-                                       <??("X", 22)> />
+                                              <?%("COND:THISROOM:FLAG:QR", 23, #"QR_ANONOPT & QR_ANONONLY", 1, "", 'checked="checked" ')>
+                                              >
                                        <?_("No anonymous messages")>
                                </li>
                                <li>
@@ -139,9 +139,10 @@
        </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>