* make the iconbar css a template

* use the #define logic for the iconbar items, first use for defines.
* thanks the_mgt for %% detection ;-)
wc_session changed, run bootstrap and make clean

diff --git a/webcit/iconbar.c b/webcit/iconbar.c
index 70c46023ad29e0a1d9182aacc601f1cb3df773fb..d9b08b6f025e857f04d2f71e693d9e2cd648c460 100644 (file)
--- a/webcit/iconbar.c
+++ b/webcit/iconbar.c
@@ -16,58 +16,54 @@ void DontDeleteThis(void *Data){}
 #define IconbarIsEnabled(a, b) IconbarIsENABLED(a, sizeof(a) - 1, b)
 
 
-
+HashList *IB_Seeting_Order = NULL;
 typedef struct _dflt_IB_Setting {
-       int DefVal;
-       const char *Key;
-       long len;
+       int         DefVal;  /* default value for non-set users */
+       long        n;       /* counter for internal purposes   */
+       const char *Key;     /* Stringvalue */
+       long        len;     /* Length... */
 }dflt_IB_Setting;
 
+long nIBV = 0;
 dflt_IB_Setting IconbarDefaults[] = {
-       {0, HKEY("ib_displayas")},
-       {0, HKEY("ib_logo")},
-       {1, HKEY("ib_summary")},
-       {1, HKEY("ib_inbox")},
-       {1, HKEY("ib_calendar")},
-       {1, HKEY("ib_contacts")},
-       {1, HKEY("ib_notes")},
-       {1, HKEY("ib_tasks")},
-       {1, HKEY("ib_rooms")},
-       {1, HKEY("ib_users")},
-       {1, HKEY("ib_chat")},
-       {1, HKEY("ib_advanced")},
-       {1, HKEY("ib_logoff")},
-       {1, HKEY("ib_citadel")},
-       {0, HKEY("")}
+       {0,  0, HKEY("unused")},
+       {0,  1, HKEY("ib_displayas")},
+       {0,  2, HKEY("ib_logo")},
+       {1,  3, HKEY("ib_summary")},
+       {1,  4, HKEY("ib_inbox")},
+       {1,  5, HKEY("ib_calendar")},
+       {1,  6, HKEY("ib_contacts")},
+       {1,  7, HKEY("ib_notes")},
+       {1,  8, HKEY("ib_tasks")},
+       {1,  9, HKEY("ib_rooms")},
+       {1, 10, HKEY("ib_users")},
+       {1, 11, HKEY("ib_chat")},
+       {1, 12, HKEY("ib_advanced")},
+       {1, 13, HKEY("ib_logoff")},
+       {1, 14, HKEY("ib_citadel")},
+       {0, 15, HKEY("")}
 };
 
 HashList *IBDfl = NULL;
 
-long IconbarGetDefault(const char *key, size_t keylen)
+
+long IconbarIsENABLED(long val, const char *key, size_t keylen)
 {
-       void *vIBDfl;
+       void *vIBDfl = NULL;
+       wcsession *WCC = WC;
 
+       if ((WCC != NULL) && 
+           (WCC->IBSettingsVec != NULL) && 
+           (val < nIBV))
+       {
+               return WCC->IBSettingsVec[val];
+       }
        if (GetHash(IBDfl, key, keylen, &vIBDfl)) {
                dflt_IB_Setting *Set = (dflt_IB_Setting*)vIBDfl;
                return Set->DefVal;
        }
-       return 0;
-}
-long IconbarIsENABLED(const char *key, size_t keylen, long defval)
-{
-       void *Data = NULL;
-       wcsession *WCC = WC;
-
-       if (WCC == NULL) 
-               return defval;
-
-       if (GetHash(WCC->IconBarSettings, 
-                   key, 
-                   keylen,
-                   &Data))
-               return (long) Data;
        else 
-               return defval;
+               return 1;
 }
 
 #ifdef DBG_ICONBAR_HASH
@@ -79,7 +75,7 @@ inline const char *PrintInt(void *Prefstr)
 }
 #endif
 
-/* Produces a stylesheet which hides any iconbar icons the user does not want */
+/* Produces a stylesheet which hides any iconbar icons the user does not want * /
 void doUserIconStylesheet(void) {
        HashPos *pos;
        void *Data;
@@ -98,7 +94,7 @@ void doUserIconStylesheet(void) {
                if (value == 0 
                    && strncasecmp("ib_displayas",key,12) 
                    && strncasecmp("ib_logoff", key, 9)) {
-                       /* Don't shoot me for this */
+                       / * Don't shoot me for this * /
                        wc_printf("#%s { display: none !important; }\r\n",key);
                } else if (!strncasecmp("ib_users",key, 8) && value == 2) {
                        wc_printf("#online_users { display: block; !important } \r\n");
@@ -108,27 +104,65 @@ void doUserIconStylesheet(void) {
        end_burst();
 }
 
+void doUserIconStylesheet(void) {
+       HashPos *pos;
+       void *Data;
+       long value;
+       const char *key;
+       long HKLen;
+       
+//     output_custom_content_header("text/css");
+       const StrBuf *MimeType;
+       begin_burst();
+       MimeType = DoTemplate(HKEY("user_iconbar"), NULL, &NoCtx);
+       http_transmit_thing(ChrPtr(MimeType), 0);
+       hprintf("Cache-Control: private\r\n");
+       
+       end_burst();
+}
+
+*/
+
+
 int ConditionalIsActiveStylesheet(StrBuf *Target, WCTemplputParams *TP) {
        long testFor;
-       int ib_displayas;
+       long lookAt;
+       long ib_displayas;
+
+       lookAt = GetTemplateTokenNumber(Target, TP, 3, IB_PICTEXT);
+       testFor = GetTemplateTokenNumber(Target, TP, 2, IB_PICTEXT);
+
+
+
+       ib_displayas = IconbarIsENABLED(lookAt, TKEY(3));
+
+       printf ("%ld == %ld ? %s : %s\n", 
+               testFor, 
+               ib_displayas, 
+               IconbarDefaults[lookAt ].Key, 
+               ChrPtr(TP->Tokens->FlatToken));
+
 
-       testFor = GetTemplateTokenNumber(Target, TP, 3, IB_PICTEXT);
-       ib_displayas = IconbarIsENABLED(TKEY(2),IconbarGetDefault(TKEY(2)));
        return (testFor == ib_displayas);
 }
 
 void LoadIconSettings(StrBuf *iconbar, long lvalue)
 {
+       void *vIBDfl;
+       dflt_IB_Setting *Set;
+       const char *pCh = NULL;
+
        wcsession *WCC = WC;
        StrBuf *buf;
        StrBuf *key;
        long val;
-       int i, nTokens;
 
-       buf = NewStrBuf();;
+       buf = NewStrBuf();
        key = NewStrBuf();
-       if (WCC->IconBarSettings == NULL)
-               WCC->IconBarSettings = NewHash(1, NULL);
+       if (WCC->IBSettingsVec == NULL)
+       {
+               WCC->IBSettingsVec = (long*) malloc (nIBV * sizeof(long));
+       }
        /**
         * The initialized values of these variables also happen to
         * specify the default values for users who haven't customized
@@ -136,16 +170,18 @@ void LoadIconSettings(StrBuf *iconbar, long lvalue)
         * configuration somewhere.
         */
 
-       nTokens = StrBufNum_tokens(iconbar, ',');
-       for (i=0; i<nTokens; ++i) {
-               StrBufExtract_token(buf, iconbar, i, ',');
+       while (StrBufExtract_NextToken(buf, iconbar, &pCh,  ',') >= 0)
+       {
                StrBufExtract_token(key, buf, 0, '=');
                val = StrBufExtract_long(buf, 1, '=');
-               Put(WCC->IconBarSettings, 
-                   ChrPtr(key), StrLength(key),
-                   (void*)val, DontDeleteThis);
-       }
 
+               if (!GetHash(IBDfl, SKEY(key), &vIBDfl)) 
+                       continue;
+               Set = (dflt_IB_Setting*)vIBDfl;
+
+               WCC->IBSettingsVec[Set->n] = val;
+               printf("%ld %s %s -> %ld \n", Set->n, Set->Key, IconbarDefaults[Set->n].Key, val);
+       }
 #ifdef DBG_ICONBAR_HASH
        dbg_PrintHash(WCC->IconBarSetttings, PrintInt, NULL);
 #endif
@@ -230,7 +266,7 @@ void
 ServerStartModule_ICONBAR
 (void)
 {
-       int i = 0;
+       int i = 1;
        IBDfl = NewHash(1, NULL);
 
        while (IconbarDefaults[i].len != 0)
@@ -248,12 +284,22 @@ void
 InitModule_ICONBAR
 (void)
 {
-       WebcitAddUrlHandler(HKEY("user_iconbar"), "", 0, doUserIconStylesheet, 0);
+       long l;
+
+       /*WebcitAddUrlHandler(HKEY("user_iconbar"), "", 0, doUserIconStylesheet, 0); */
        WebcitAddUrlHandler(HKEY("commit_iconbar"), "", 0, commit_iconbar, 0);
        RegisterConditional(HKEY("COND:ICONBAR:ACTIVE"), 3, ConditionalIsActiveStylesheet, CTX_NONE);
        RegisterNamespace("ICONBAR", 0, 0, tmplput_iconbar, NULL, CTX_NONE);
 
        RegisterPreference("iconbar", _("Iconbar Setting"), PRF_STRING, LoadIconSettings);
+       l = 1;
+       while (IconbarDefaults[l].len != 0)
+       {
+               RegisterTokenParamDefine(IconbarDefaults[l].Key, 
+                                        IconbarDefaults[l].len, l);
+               l ++;
+       }
+       nIBV = l;
 }
 
 
@@ -262,5 +308,6 @@ void
 SessionDestroyModule_ICONBAR
 (wcsession *sess)
 {
-       DeleteHash(&sess->IconBarSettings);
+       if (sess->IBSettingsVec != NULL)
+               free(sess->IBSettingsVec);
 }

diff --git a/webcit/static/t/head.html b/webcit/static/t/head.html
index 4b7547d52f51da13744d1b3ecf1aa77b58630d38..272de2f2a76572f33c464f7e5bcd9334a2c7cfa9 100644 (file)
--- a/webcit/static/t/head.html
+++ b/webcit/static/t/head.html
@@ -11,9 +11,9 @@
 <link href="static/bt.css" rel="stylesheet" type="text/css">
 
 <??("COND:LOGGEDIN",1)>
-<link href="user_iconbar" rel="stylesheet" type="text/css">
-<link href="static/iconbaricns.css" rel="<?%("COND:ICONBAR:ACTIVE", 1 , "ib_displayas", 0, "", "alternate ")>stylesheet" type="text/css" id="style_iconbar_icns" title="Default iconbar">
-<link href="static/iconbarpiconly.css" rel="<?%("COND:ICONBAR:ACTIVE", 1 , "ib_displayas", 1, "","alternate ")>stylesheet" type="text/css" id="style_iconbar_piconly" title="Iconbar without text">
+<link href="do_template?template=iconbar_user" rel="stylesheet" type="text/css">
+<link href="static/iconbaricns.css" rel="<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_displayas", "", "alternate ")>stylesheet" type="text/css" id="style_iconbar_icns" title="Default iconbar">
+<link href="static/iconbarpiconly.css" rel="<?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_displayas", "","alternate ")>stylesheet" type="text/css" id="style_iconbar_piconly" title="Iconbar without text">
 <??("X",1)>
 
 <?CSSLOCAL> 

diff --git a/webcit/static/t/iconbar_edit.html b/webcit/static/t/iconbar_edit.html
index 3a4b3ba5ae9564a3fdbd027ad8dd54ff323c4722..2ca84b9cbd967763ec47be3d13263466e2a44528 100644 (file)
--- a/webcit/static/t/iconbar_edit.html
+++ b/webcit/static/t/iconbar_edit.html
@@ -11,83 +11,83 @@
 <table class="altern" >
 <tr><td></td><td colspan="2"><b><?_("Display icons as:")></b>
 
-<input type="radio" name="ib_displayas" value="0", "<?%("COND:ICONBAR:ACTIVE", 1 , "ib_displayas", 0, "CHECKED", "")>"><?_("pictures and text")></input>
-<input type="radio" name="ib_displayas" value="1", "<?%("COND:ICONBAR:ACTIVE", 1 , "ib_displayas", 1, "CHECKED", "")>"><?_("pictures only")></input>
-<input type="radio" name="ib_displayas" value="2", "<?%("COND:ICONBAR:ACTIVE", 1 , "ib_displayas", 2, "CHECKED", "")>"><?_("text only")></input>
+<input type="radio" name="ib_displayas" value="0" <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_displayas", "CHECKED", "")>><?_("pictures and text")></input>
+<input type="radio" name="ib_displayas" value="1" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_displayas", "CHECKED", "")>><?_("pictures only")></input>
+<input type="radio" name="ib_displayas" value="2" <?%("COND:ICONBAR:ACTIVE", 1, 2, #"ib_displayas", "CHECKED", "")>><?_("text only")></input>
 <br />
 <?_("Select the icons you would like to see displayed in the 'icon bar' menu on the left side of the screen.")>
 </td></tr>
 
 <tr class="even"><td>
-<input type="radio" name="ib_logo" value="yes" <?%("COND:ICONBAR:ACTIVE", 1 , "ib_logo", 1, "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
-<input type="radio" name="ib_logo" value="no"  <?%("COND:ICONBAR:ACTIVE", 1 , "ib_logo", 0, "CHECKED", "")>> <?_("No")> <br />
+<input type="radio" name="ib_logo" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_logo", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
+<input type="radio" name="ib_logo" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_logo", "CHECKED", "")>> <?_("No")> <br />
 </td><td><img src="image?name=hello" width="48" alt="&nbsp;">
 </td><td><b><?_("Site logo")></b><br /><?_("An icon describing this site")></td></tr>
 
 <tr class="odd"><td>
-<input type="radio" name="ib_summary" value="yes" <?%("COND:ICONBAR:ACTIVE", 1 , "ib_summary", 1, "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
-<input type="radio" name="ib_summary" value="no"  <?%("COND:ICONBAR:ACTIVE", 1 , "ib_summary", 0, "CHECKED", "")>> <?_("No")> <br />
+<input type="radio" name="ib_summary" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_summary", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
+<input type="radio" name="ib_summary" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_summary", "CHECKED", "")>> <?_("No")> <br />
 </td><td><img src="static/summscreen_48x.gif" alt="&nbsp;">
 </td><td><b><?_("Summary")></b><br /><?_("Your summary page")></td></tr>
 
 <tr class="even"><td>
-<input type="radio" name="ib_inbox" value="yes" <?%("COND:ICONBAR:ACTIVE", 1 , "ib_inbox", 1, "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
-<input type="radio" name="ib_inbox" value="no"  <?%("COND:ICONBAR:ACTIVE", 1 , "ib_inbox", 0, "CHECKED", "")>> <?_("No")> <br />
+<input type="radio" name="ib_inbox" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_inbox", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
+<input type="radio" name="ib_inbox" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_inbox", "CHECKED", "")>> <?_("No")> <br />
 </td><td><img src="static/privatemess_48x.gif" alt="&nbsp;">
 </td><td><b><?_("Mail (inbox)")></b><br /><?_("A shortcut to your email Inbox")></td></tr>
 
 <tr class="odd"><td>
-<input type="radio" name="ib_contacts" value="yes" <?%("COND:ICONBAR:ACTIVE", 1 , "ib_contacts", 1, "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
-<input type="radio" name="ib_contacts" value="no"  <?%("COND:ICONBAR:ACTIVE", 1 , "ib_contacts", 0, "CHECKED", "")>> <?_("No")> <br />
+<input type="radio" name="ib_contacts" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_contacts", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
+<input type="radio" name="ib_contacts" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_contacts", "CHECKED", "")>> <?_("No")> <br />
 </td><td><img src="static/viewcontacts_48x.gif" alt="&nbsp;">
 </td><td><b><?_("Contacts")></b><br /><?_("Your personal address book")></td></tr>
 
 <tr class="even"><td>
-<input type="radio" name="ib_notes" value="yes" <?%("COND:ICONBAR:ACTIVE", 1 , "ib_notes", 1, "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
-<input type="radio" name="ib_notes" value="no"  <?%("COND:ICONBAR:ACTIVE", 1 , "ib_notes", 0, "CHECKED", "")>> <?_("No")> <br />
+<input type="radio" name="ib_notes" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_notes", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
+<input type="radio" name="ib_notes" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_notes", "CHECKED", "")>> <?_("No")> <br />
 </td><td><img src="static/storenotes_48x.gif" alt="&nbsp;">
 </td><td><b><?_("Notes")></b><br /><?_("Your personal notes")></td></tr>
 
 <tr class="odd"><td>
-<input type="radio" name="ib_calendar" value="yes" <?%("COND:ICONBAR:ACTIVE", 1 , "ib_calendar", 1, "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
-<input type="radio" name="ib_calendar" value="no"  <?%("COND:ICONBAR:ACTIVE", 1 , "ib_calendar", 0, "CHECKED", "")>> <?_("No")> <br />
+<input type="radio" name="ib_calendar" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_calendar", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
+<input type="radio" name="ib_calendar" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_calendar", "CHECKED", "")>> <?_("No")> <br />
 </td><td><img src="static/calarea_48x.gif" alt="&nbsp;">
 </td><td><b><?_("Calendar")></b><br /><?_("A shortcut to your personal calendar")></td></tr>
 
 <tr class="even"><td>
-<input type="radio" name="ib_tasks" value="yes" <?%("COND:ICONBAR:ACTIVE", 1 , "ib_tasks", 1, "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
-<input type="radio" name="ib_tasks" value="no"  <?%("COND:ICONBAR:ACTIVE", 1 , "ib_tasks", 0, "CHECKED", "")>> <?_("No")> <br />
+<input type="radio" name="ib_tasks" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_tasks", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
+<input type="radio" name="ib_tasks" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_tasks", "CHECKED", "")>> <?_("No")> <br />
 </td><td><img src="static/taskmanag_48x.gif" alt="&nbsp;">
 </td><td><b><?_("Tasks")></b><br /><?_("A shortcut to your personal task list")></td></tr>
 
 <tr class="odd"><td>
-<input type="radio" name="ib_rooms" value="yes" <?%("COND:ICONBAR:ACTIVE", 1 , "ib_rooms", 1, "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
-<input type="radio" name="ib_rooms" value="no"  <?%("COND:ICONBAR:ACTIVE", 1 , "ib_rooms", 0, "CHECKED", "")>> <?_("No")> <br />
+<input type="radio" name="ib_rooms" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_rooms", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
+<input type="radio" name="ib_rooms" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_rooms", "CHECKED", "")>> <?_("No")> <br />
 </td><td><img src="static/chatrooms_48x.gif" alt="&nbsp;">
 </td><td><b><?_("Rooms")></b><br /><?_("Clicking this icon displays a list of all accessible rooms (or folders) available.")></td></tr>
 
 <tr class="even"><td>
-<input type="radio" name="ib_users" value="yes"     <?%("COND:ICONBAR:ACTIVE", 1 , "ib_users", 1, "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
-<input type="radio" name="ib_users" value="no"      <?%("COND:ICONBAR:ACTIVE", 1 , "ib_users", 0, "CHECKED", "")>> <?_("No")> <br />
-<input type="radio" name="ib_users" value="yeslist" <?%("COND:ICONBAR:ACTIVE", 1 , "ib_users", 2, "CHECKED", "")>> <?_("Yes with users list")></td><td>
+<input type="radio" name="ib_users" value="yes"     <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_users", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
+<input type="radio" name="ib_users" value="no"      <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_users", "CHECKED", "")>> <?_("No")> <br />
+<input type="radio" name="ib_users" value="yeslist" <?%("COND:ICONBAR:ACTIVE", 1, 2, #"ib_users", "CHECKED", "")>> <?_("Yes with users list")></td><td>
 <img src="static/usermanag_48x.gif" alt="&nbsp;">
 </td><td><b><?_("Who is online?")></b><br /><?_("Clicking this icon displays a list of all users currently logged in.")></td></tr>
 
 <tr class="odd"><td>
-<input type="radio" name="ib_chat" value="yes" <?%("COND:ICONBAR:ACTIVE", 1 , "ib_chat", 1, "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
-<input type="radio" name="ib_chat" value="no"  <?%("COND:ICONBAR:ACTIVE", 1 , "ib_chat", 0, "CHECKED", "")>> <?_("No")> <br />
+<input type="radio" name="ib_chat" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_chat", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
+<input type="radio" name="ib_chat" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_chat", "CHECKED", "")>> <?_("No")> <br />
 </td><td><img src="static/citadelchat_48x.gif" alt="&nbsp;">
 </td><td><b><?_("Chat")></b><br /><?_("Clicking this icon enters real-time chat mode with other users in the same room.")></td></tr>
 
 <tr class="even"><td>
-<input type="radio" name="ib_advanced" value="yes" <?%("COND:ICONBAR:ACTIVE", 1 , "ib_advanced", 1, "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
-<input type="radio" name="ib_advanced" value="no"  <?%("COND:ICONBAR:ACTIVE", 1 , "ib_advanced", 0, "CHECKED", "")>> <?_("No")> <br />
+<input type="radio" name="ib_advanced" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_advanced", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
+<input type="radio" name="ib_advanced" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_advanced", "CHECKED", "")>> <?_("No")> <br />
 </td><td><img src="static/advanpage2_48x.gif" alt="&nbsp;">
 </td><td><b><?_("Advanced options")></b><br /><?_("Access to the complete menu of Citadel functions.")></td></tr>
 
 <tr class="odd"><td>
-<input type="radio" name="ib_citadel" value="yes" <?%("COND:ICONBAR:ACTIVE", 1 , "ib_citadel", 1, "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
-<input type="radio" name="ib_citadel" value="no"  <?%("COND:ICONBAR:ACTIVE", 1 , "ib_citadel", 0, "CHECKED", "")>> <?_("No")> <br />
+<input type="radio" name="ib_citadel" value="yes" <?%("COND:ICONBAR:ACTIVE", 1, 1, #"ib_citadel", "CHECKED", "")>> <?_("Yes")> &nbsp;&nbsp;&nbsp;
+<input type="radio" name="ib_citadel" value="no"  <?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_citadel", "CHECKED", "")>> <?_("No")> <br />
 </td><td><img border="0" width="48" height="48" src="static/citadel-logo.gif" alt="&nbsp;">
 </td><td><b><?_("Citadel logo")></b><br /><?_("Displays the 'Powered by Citadel' icon")></td></tr>
 

diff --git a/webcit/static/t/iconbar_user.css b/webcit/static/t/iconbar_user.css
new file mode 100644 (file)
index 0000000..1942ebe
--- /dev/null
+++ b/webcit/static/t/iconbar_user.css
@@ -0,0 +1,21 @@
+#global { left: 16%; }
+
+# { display: none !important; }
+
+<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_displayas", "#ib_displayas { display: none !important; }" , "")>
+<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_logo"     , "#ib_logo      { display: none !important; }" , "")>
+<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_summary"  , "#ib_summary   { display: none !important; }" , "")>
+<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_inbox"    , "#ib_inbox     { display: none !important; }" , "")>
+<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_calendar" , "#ib_calendar  { display: none !important; }" , "")>
+<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_contacts" , "#ib_contacts  { display: none !important; }" , "")>
+<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_notes"    , "#ib_notes     { display: none !important; }" , "")>
+<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_tasks"    , "#ib_tasks     { display: none !important; }" , "")>
+<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_rooms"    , "#ib_rooms     { display: none !important; }" , "")>
+
+<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_users"    , "#ib_users     { display: none !important; }" , "")>
+<?%("COND:ICONBAR:ACTIVE", 1, 2, #"ib_users"    , "#online_users { display: block; !important }", "")>
+
+<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_chat"     , "#ib_chat      { display: none !important; }" , "")>
+<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_advanced" , "#ib_advanced  { display: none !important; }" , "")>
+<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_logoff"   , "#ib_logoff    { display: none !important; }" , "")>
+<?%("COND:ICONBAR:ACTIVE", 1, 0, #"ib_citadel"  , "#ib_citadel   { display: none !important; }" , "")>

diff --git a/webcit/webcit.h b/webcit/webcit.h
index e015ce50fb4b9b18d3e5c77a2503e8efbf741a8e..a9746f93e36439cc41058f41914c65250e6d3387 100644 (file)
--- a/webcit/webcit.h
+++ b/webcit/webcit.h
@@ -520,7 +520,7 @@ struct wcsession {
        int cache_max_folders;
        int cache_num_floors;
        time_t cache_timestamp;
-       HashList *IconBarSettings;              /* which icons should be shown / not shown? */
+       long *IBSettingsVec;                    /* which icons should be shown / not shown? */
        const StrBuf *floordiv_expanded;        /* which floordiv currently expanded */