From 16ba87bce90d86fbf331e6253a00aeaa93c71d28 Mon Sep 17 00:00:00 2001 From: Matt Date: Mon, 26 Jan 2009 06:54:45 +0000 Subject: [PATCH] * fix some fallout from last commit: iconbar now in head.html so no one should call it themselves * set WC->logged_in to 0 at the top of do_logout() to surpress iconbar on logout * Fix IE6 iconbar bug, still not as good as it used to look :( * Completely rework roombanner etc. so the web browser sizes roombanner, navbar etc. itself * Added javascript hack so the new roombanner works in browsers that don't do display: table-cell; --- webcit/auth.c | 4 ++ webcit/iconbar.c | 1 + webcit/static/iconbaricns.css | 4 +- webcit/static/summaryview.js | 30 ++++++----- webcit/static/t/add_node.html | 1 - webcit/static/t/aide_inetconf.html | 1 - webcit/static/t/display_aide_menu.html | 1 - .../static/t/display_ignet_confirmdelete.html | 1 - webcit/static/t/display_main_menu.html | 1 - webcit/static/t/display_netconf.html | 1 - webcit/static/t/display_sitewide_config.html | 2 +- webcit/static/t/edit_message.html | 1 - webcit/static/t/edit_node.html | 1 - webcit/static/t/edituser_select.html | 1 - webcit/static/t/files.html | 1 - webcit/static/t/files_jspicview.html | 1 - webcit/static/t/head.html | 2 +- webcit/static/t/preferences.html | 1 - webcit/static/t/roombanner.html | 4 +- webcit/static/t/userlist_detailview.html | 1 - webcit/static/t/who.html | 1 - webcit/static/wclib.js | 27 ++++++++++ webcit/static/webcit.css | 51 ++++++++++++------- 23 files changed, 90 insertions(+), 49 deletions(-) diff --git a/webcit/auth.c b/webcit/auth.c index e48c4e69c..80543450f 100644 --- a/webcit/auth.c +++ b/webcit/auth.c @@ -570,6 +570,10 @@ void do_logout(void) FlushStrBuf(WC->wc_roomname); FlushStrBuf(WC->wc_fullname); + /* FIXME: this is to suppress the iconbar displaying, because we aren't + actually logged out yet */ + WC->logged_in = 0; + /** Calling output_headers() this way causes the cookies to be un-set */ output_headers(1, 1, 0, 1, 0, 0); diff --git a/webcit/iconbar.c b/webcit/iconbar.c index a0ccd2882..c1ba02ca0 100644 --- a/webcit/iconbar.c +++ b/webcit/iconbar.c @@ -48,6 +48,7 @@ void doUserIconStylesheet(void) { hprintf("Cache-Control: private\r\n"); begin_burst(); + wprintf("#global { left: 16%%; }\r\n"); pos = GetNewHashPos(WC->IconBarSettings, 0); while(GetNextHashPos(WC->IconBarSettings, pos, &HKLen, &key, &Data)) { value = (long) Data; diff --git a/webcit/static/iconbaricns.css b/webcit/static/iconbaricns.css index 8e41bd078..cc48ce409 100644 --- a/webcit/static/iconbaricns.css +++ b/webcit/static/iconbaricns.css @@ -1,9 +1,9 @@ -#button > li , #ib_logoff { +#button li , #ib_logoff { min-height: 32px; background-repeat: no-repeat !important; vertical-align: middle; } -#button > li > a , #ib_logoff > a { +#button li a , #ib_logoff a { padding-top: 6px; padding-left: 35px; min-height: 25px; /* Makes all of the 'button' to be clickable */ diff --git a/webcit/static/summaryview.js b/webcit/static/summaryview.js index b19e7efbd..9132c33d4 100644 --- a/webcit/static/summaryview.js +++ b/webcit/static/summaryview.js @@ -57,7 +57,6 @@ function createMessageView() { $('m_refresh').observe('click', getMessages); document.getElementById('m_refresh').setAttribute("href","#"); Event.observe(document.onresize ? document : window, "resize", normalizeHeaderTable); - sizePreviewPane(); Event.observe(document.onresize ? document : window, "resize", sizePreviewPane); $('summpage').observe('change', getPage); takeOverSearchOMatic(); @@ -163,6 +162,7 @@ function loadMessages(transport) { if (loadingMsg.parentNode != null) { loadingMsg.parentNode.removeChild(loadingMsg); } + sizePreviewPane(); } function resortAndDisplay(sortMode) { var start = new Date(); @@ -407,18 +407,23 @@ function CtdlResizeMouseDown(event) { function sizePreviewPane() { var preview_pane = document.getElementById("preview_pane"); - var content = $('content'); // we'd like to use prototype methods here + var summary_view = document.getElementById("summary_view"); + var banner = document.getElementById("banner"); + var message_list_hdr = document.getElementById("message_list_hdr"); + var content = $('global'); // we'd like to use prototype methods here var childElements = content.childElements(); var sizeOfElementsAbove = 0; - var heightOfContent = content.offsetHeight; - for(var i=0; i -