From 8c36f32119fea5dac25bedc50a3ecb14992006fa Mon Sep 17 00:00:00 2001 From: Art Cancro Date: Tue, 29 Nov 2005 04:04:32 +0000 Subject: [PATCH] * Made the iconbar room list somewhat usable (collapse/expand). It is not yet a drop target, though, which is why we did all this in the first place. --- webcit/ChangeLog | 4 ++++ webcit/context_loop.c | 4 ++-- webcit/gettext.c | 2 +- webcit/roomops.c | 9 +++++++-- webcit/static/wclib.js | 11 ++++++++++- webcit/static/webcit.css | 3 +++ 6 files changed, 27 insertions(+), 6 deletions(-) diff --git a/webcit/ChangeLog b/webcit/ChangeLog index 4eb2e7754..288be7d18 100644 --- a/webcit/ChangeLog +++ b/webcit/ChangeLog @@ -1,5 +1,9 @@ $Id$ +Mon Nov 28 23:04:13 EST 2005 ajc +* Made the iconbar room list somewhat usable (collapse/expand). It is not yet + a drop target, though, which is why we did all this in the first place. + Mon Nov 27 21:28:03 CET 2005 dothebart * migrate to _GNU_SOURCE and uselocale() to be threadsafe. diff --git a/webcit/context_loop.c b/webcit/context_loop.c index aa2863895..b4d15e1ab 100644 --- a/webcit/context_loop.c +++ b/webcit/context_loop.c @@ -290,9 +290,9 @@ void context_loop(int sock) if_modified_since = httpdate_to_timestamp(&buf[19]); } - if (!strncasecmp(buf, "Accept-Language: ", 17)) { + /*if (!strncasecmp(buf, "Accept-Language: ", 17)) { httplang_to_locale(&buf[17]); - } + }*/ /* * Read in the request diff --git a/webcit/gettext.c b/webcit/gettext.c index 6fd2a96e5..f5e5a331b 100644 --- a/webcit/gettext.c +++ b/webcit/gettext.c @@ -60,7 +60,7 @@ void httplang_to_locale(const char* LocaleString) strlen(wanted_locales[i])); if (!ret) { - locale=(char*)AvailLang[j];//wanted_locales[i]; + locale=(char*)AvailLang[j]; //wanted_locales[i]; i=nFound+1; j=nAvail+1; continue; diff --git a/webcit/roomops.c b/webcit/roomops.c index 6351ddfa7..7a1131929 100644 --- a/webcit/roomops.c +++ b/webcit/roomops.c @@ -2560,14 +2560,18 @@ void do_iconbar_view(struct folder *fold, int max_folders, int num_floors) { && (strlen(old_floor_name) > 0) ) { /* End inner box */ wprintf("
\n"); + wprintf("\n"); /* nfmd */ } strcpy(old_floor_name, floor_name); if (levels == 1) { - /* Begin inner box */ + /* Begin floor */ stresc(boxtitle, floor_name, 1, 0); svprintf("BOXTITLE", WCS_STRING, boxtitle); - wprintf("%s
\n", boxtitle); + wprintf("" + "%s
\n", i, boxtitle); + wprintf("
", i); } oldlevels = levels; @@ -2604,6 +2608,7 @@ void do_iconbar_view(struct folder *fold, int max_folders, int num_floors) { wprintf("
\n"); } } + wprintf("
\n"); /* nfmd */ } diff --git a/webcit/static/wclib.js b/webcit/static/wclib.js index a3bb8adeb..2464fff08 100644 --- a/webcit/static/wclib.js +++ b/webcit/static/wclib.js @@ -358,9 +358,18 @@ function ctdl_ts_getInnerText(el) { // icon bar toggler tabs... +var which_div_expanded = null; + function switch_to_room_list() { new Ajax.Updater('iconbar', 'iconbar_ajax_rooms', { method: 'get' } ); - fuckitup(); +} + +function expand_floor(floor_div) { + if (which_div_expanded != null) { + $(which_div_expanded).style.display = 'none' ; + } + $(floor_div).style.display = 'block'; + which_div_expanded = floor_div; } function switch_to_menu_buttons() { diff --git a/webcit/static/webcit.css b/webcit/static/webcit.css index dce6fd6dd..c41b21c7f 100644 --- a/webcit/static/webcit.css +++ b/webcit/static/webcit.css @@ -350,17 +350,20 @@ a:hover { font-size: 8pt; font-weight: bold; color: #000000; + cursor: pointer; } .ib_roomlist_new { font-size: 6pt; color: #880000; font-weight: bold; + cursor: pointer; } .ib_roomlist_old { font-size: 6pt; color: #000088; + cursor: pointer; } .mailbox_summary { -- 2.39.2