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

diff --git a/webcit/static/t/room/edit/tab_config.html b/webcit/static/t/room/edit/tab_config.html
index 4564b453f40f842e3a47d7cad80fe9d1ec0b685b..44c8c04fbdf37f017e0e61a7bcee03a5e4e2db95 100644 (file)
--- a/webcit/static/t/room/edit/tab_config.html
+++ b/webcit/static/t/room/edit/tab_config.html
@@ -9,7 +9,7 @@
                        <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>
@@ -37,7 +37,7 @@
                                        </li>
                                        <li>
                                                <input type="radio" name="type" value="invonly" 
-                                                      <??("COND:THISROOM:FLAG:QR", 9, #"QR_PASSWORDED & QR_GUESSNAME")>
+                                                      <??("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; }" />
@@ -78,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" 

diff --git a/webcit/tabs.c b/webcit/tabs.c
index 53b8e87c06558cda72da79918ccb221b664ec4d6..c22f738b2c18a49eb6dd3801db157fe0ffc58a56 100644 (file)
--- a/webcit/tabs.c
+++ b/webcit/tabs.c
@@ -173,7 +173,7 @@ void StrBeginTab(StrBuf *Target, int tabnum, int num_tabs, StrBuf **Names) {
        else {
                StrBufAppendBufPlain(
                        Target, 
-                       HKEY("<!-- begin tab"), 0);
+                       HKEY("<!-- begin tab "), 0);
                StrBufAppendPrintf(
                        Target,  "%d of %d [",
                        tabnum, num_tabs);