From: Matt Date: Wed, 28 Jan 2009 02:56:19 +0000 (+0000) Subject: * restore context menu in online user list X-Git-Tag: v7.86~1551 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=cd965b7e2a4e76ebe30b4c3155920e97b1350109 * restore context menu in online user list * fix online user in iconbar list becoming big after last commit * replace #iconbar > ul > li selectors with classes so IE6 can understand them, and so these changes don't cause the above --- diff --git a/webcit/roomops.c b/webcit/roomops.c index 6011b116e..7b3a39617 100644 --- a/webcit/roomops.c +++ b/webcit/roomops.c @@ -3633,7 +3633,7 @@ void knrooms(void) /** title bar */ wprintf("
\n"); - wprintf("
"); + wprintf("
"); wprintf("

"); if (!strcasecmp(ChrPtr(ListView), "rooms")) { wprintf(_("Room list")); diff --git a/webcit/static/iconbaricns.css b/webcit/static/iconbaricns.css index cc48ce409..e8e940776 100644 --- a/webcit/static/iconbaricns.css +++ b/webcit/static/iconbaricns.css @@ -1,13 +1,13 @@ -#button li , #ib_logoff { +.ib_button { min-height: 32px; background-repeat: no-repeat !important; vertical-align: middle; } -#button li a , #ib_logoff a { +.ib_button_link { padding-top: 6px; padding-left: 35px; - min-height: 25px; /* Makes all of the 'button' to be clickable */ height: 100%; + min-height: 25px; /* Makes all of the 'button' to be clickable */ } #ib_summary { background-image: url("/static/summscreen_32x.gif"); diff --git a/webcit/static/iconbarpiconly.css b/webcit/static/iconbarpiconly.css index 25ecfbffb..1577608b3 100644 --- a/webcit/static/iconbarpiconly.css +++ b/webcit/static/iconbarpiconly.css @@ -1,11 +1,11 @@ @import url("/static/iconbaricns.css"); -#button > li { +.ib_button { width: 35px; } -#button > li > a { +.ib_button_link { padding-left: 0; } -#button > li > a > span { +.ib_button_link span { display: none; } \ No newline at end of file diff --git a/webcit/static/summaryview.js b/webcit/static/summaryview.js index 8f3a479cd..913a389df 100644 --- a/webcit/static/summaryview.js +++ b/webcit/static/summaryview.js @@ -52,7 +52,7 @@ function createMessageView() { mlh_subject.observe('click',ApplySort); mlh_from.observe('click',ApplySort); $(document).observe('keyup',CtdlMessageListKeyUp,false); - window.oncontextmenu = function() { return false; }; + //window.oncontextmenu = function() { return false; }; $('resize_msglist').observe('mousedown', CtdlResizeMouseDown); $('m_refresh').observe('click', getMessages); document.getElementById('m_refresh').setAttribute("href","#"); @@ -361,11 +361,17 @@ function CtdlMessageListKeyUp(event) { var key = event.which; if (key == 46) { // DELETE for(msgId in currentlyMarkedRows) { + if (!room_is_trash) { new Ajax.Request('ajax_servcmd', {method: 'post', parameters: 'g_cmd=MOVE ' + msgId + '|_TRASH_|0' }); + } else { + new Ajax.Request('ajax_servcmd', {method: 'post', + parameters: 'g_cmd=DELE '+msgId}); + } } + document.getElementById("preview_pane").innerHTML = ""; deleteAllMarkedRows(); } } @@ -468,6 +474,7 @@ function ApplySorterToggle() { function normalizeHeaderTable() { var message_list_hdr = document.getElementById("message_list_hdr"); var summary_view = document.getElementById("summary_view"); + var resize_msglist = document.getElementById("resize_msglist"); var headerTable = message_list_hdr.getElementsByTagName("table")[0]; var dataTable = summary_view.getElementsByTagName("table")[0]; var dataTableWidth = dataTable.offsetWidth; diff --git a/webcit/static/t/iconbar.html b/webcit/static/t/iconbar.html index dc25d8b89..c5a47a972 100644 --- a/webcit/static/t/iconbar.html +++ b/webcit/static/t/iconbar.html @@ -6,43 +6,43 @@
-
-');" +
+');" title=""> diff --git a/webcit/static/wclib.js b/webcit/static/wclib.js index f7db14842..6566a1985 100644 --- a/webcit/static/wclib.js +++ b/webcit/static/wclib.js @@ -147,7 +147,7 @@ function setupIconBar() { } } var online_users = document.getElementById("online_users"); - if (online_users.offsetParent != null) { + if (online_users.offsetParent != null && online_users.offsetTop > 0) { new Ajax.PeriodicalUpdater('online_users', 'do_template?template=wholist_section', {method: 'get', frequency: 30}); } } @@ -789,6 +789,21 @@ function fixMissingCSSTable(elems) { } } function fixbanner() { + // Use prototype api methods here var elems = [$('room_banner'),$('actiondiv')]; fixMissingCSSTable(elems); + var banner = $('banner'); + if (banner != null) { + } +} + +function fixOffsetBanner() { + var banner = document.getElementById("banner"); + if (banner.offsetLeft > 0) { + var viewportWidth = document.viewport.getWidth(); + var iconbarWidth = document.getElementById("iconbar").offsetWidth; + var contentDiv = document.getElementById("content"); + var newContentWidth = viewportWidth-iconbarWidth; + contentDiv.style.width = newContentWidth+"px"; + } } diff --git a/webcit/static/webcit.css b/webcit/static/webcit.css index 80dd0d2f1..85890dccf 100644 --- a/webcit/static/webcit.css +++ b/webcit/static/webcit.css @@ -31,8 +31,8 @@ body { font-size: 100%;} font-size: 80%; } -#online_users li { - font-size: 80%; +#online_users li a { + font-size: 80% !important; } .marked_row { color: white; @@ -70,7 +70,7 @@ body { text-transform: uppercase; } -#iconbar ul li, #room_infos, #address_book_popup,.roomops_cell, .roomops_cell_edit, .mimepart, #ib_logoff, .iconbar_text { +.ib_button, #room_infos, #address_book_popup,.roomops_cell, .roomops_cell_edit, .mimepart, .iconbar_text { background-color: #F0FFFF; color: #333; } @@ -80,7 +80,7 @@ body { list-style: none; } -#iconbar li a, #ib_logoff a { +.ib_button { font-size: 100%; } @@ -95,7 +95,7 @@ body { font-weight: 700; } -#button li, #ib_logoff { +.ib_button { border: none; border-bottom: 2px groove #CCC; border-right: 2px groove #CCC; @@ -110,7 +110,7 @@ body { border-bottom: 1px solid #AAA; } -#button li a , #ib_logoff a{ +.ib_button_link, .ib_button_link:visited, .ib_button_link:link, #online_users a { color: #000; text-decoration: none; } @@ -464,7 +464,7 @@ a:visited { color: purple; } #customize a:active, #customize a:link, #customize a:visited { color: black; } -#important_message, .buttons a:hover, .msgbuttons a:hover, #button > li:hover, #online_users li a:hover, #navbar ul li a:hover, #ib_logoff:hover { +#important_message, .buttons a:hover, .msgbuttons a:hover, #button li:hover, #online_users li a:hover, #navbar ul li a:hover, #ib_logoff:hover { background-color: #AD1C00; color: #FFF; } /* input:hover as well?? */ @@ -742,7 +742,7 @@ body, #global { /* Iconbar */ -.logo, .logo_citadel, #iconbar #button, .iconbar_text, #ib_logoff { +.logo, .logo_citadel, #iconbar #button, .iconbar_text, .ib_button { margin: 0; padding: 0; } @@ -758,13 +758,13 @@ body, #global { width: 100%; } -#button > li, #ib_logoff { +.ib_button { margin: 4px 8px 4px 8px; padding: 0; display: block; } -#button > li > a, #ib_logoff > a { - width: 100%; +.ib_button_link { + /* width: 100%; */ display: block; }