From: Matt Date: Mon, 26 Jan 2009 10:35:34 +0000 (+0000) Subject: * add missing banner on preferences template X-Git-Tag: v7.86~1562 X-Git-Url: https://code.citadel.org/?p=citadel.git;a=commitdiff_plain;h=0bb844d915fb5f0faab2e1321bcba73db25fd5d8 * add missing banner on preferences template * set min-height for #banner for non-room screens * update knrooms header to match room screens * summary view remembers size of list pane * fix double iconbar in graphics upload * fix enter message not being in the right div + overflowing * disable :hover rule for input fields --- diff --git a/webcit/graphics.c b/webcit/graphics.c index 361c19752..b62dd374a 100644 --- a/webcit/graphics.c +++ b/webcit/graphics.c @@ -22,7 +22,7 @@ void display_graphics_upload(char *description, char *filename, char *uplurl) display_main_menu(); return; } - output_headers(1, 1, 0, 0, 0, 0); + //output_headers(1, 1, 0, 0, 0, 0); output_headers(1, 1, 1, 0, 0, 0); diff --git a/webcit/roomops.c b/webcit/roomops.c index 677fa66c1..6011b116e 100644 --- a/webcit/roomops.c +++ b/webcit/roomops.c @@ -3645,8 +3645,9 @@ void knrooms(void) wprintf(_("Room list")); } wprintf("\n"); - + /** offer the ability to switch views */ + wprintf("
"); wprintf("
\n"); + wprintf("\n"); wprintf("
\n"); diff --git a/webcit/static/summaryview.js b/webcit/static/summaryview.js index 9132c33d4..8f3a479cd 100644 --- a/webcit/static/summaryview.js +++ b/webcit/static/summaryview.js @@ -418,9 +418,12 @@ function sizePreviewPane() { var contentViewPortHeight = heightOfViewPort-banner.offsetHeight-message_list_hdr.offsetHeight; contentViewPortHeight = 0.98 * contentViewPortHeight; // leave some error // Set summary_view to 20%; - var summary_height = 0.20 * contentViewPortHeight; + var summary_height = ctdlLocalPrefs.readPref("svheight"); + if (summary_height == null) { + summary_height = 0.20 * contentViewPortHeight; + } // Set preview_pane to the remainder - var preview_height = 0.80 * contentViewPortHeight; + var preview_height = contentViewPortHeight - summary_height; summary_view.style.height = (summary_height)+"px"; preview_pane.style.height = (preview_height)+"px"; @@ -431,7 +434,10 @@ function CtdlResizeMouseMove(event) { var summary_view = document.getElementById("summary_view"); var summaryViewHeight = summary_view.offsetHeight; var increment = clientY-saved_y; - summary_view.style.height = (increment+summaryViewHeight)+"px"; + var summary_view_height = increment+summaryViewHeight; + summary_view.style.height = (summary_view_height)+"px"; + // store summary view height + ctdlLocalPrefs.setPref("svheight",summary_view_height); var msglist = document.getElementById("preview_pane"); var msgListHeight = msglist.offsetHeight; msglist.style.height = (msgListHeight-increment)+"px"; diff --git a/webcit/static/t/edit_message.html b/webcit/static/t/edit_message.html index f50994152..405281792 100644 --- a/webcit/static/t/edit_message.html +++ b/webcit/static/t/edit_message.html @@ -1,7 +1,6 @@ -
@@ -123,7 +122,7 @@ activate_entmsg_autocompleters(); - +
diff --git a/webcit/static/t/iconbar.html b/webcit/static/t/iconbar.html index 6ec4938e5..dc25d8b89 100644 --- a/webcit/static/t/iconbar.html +++ b/webcit/static/t/iconbar.html @@ -79,4 +79,9 @@ title="">
+
+ + + +
diff --git a/webcit/static/t/preferences.html b/webcit/static/t/preferences.html index fcb23f77a..6bfb18fc0 100644 --- a/webcit/static/t/preferences.html +++ b/webcit/static/t/preferences.html @@ -1,6 +1,7 @@
diff --git a/webcit/static/wclib.js b/webcit/static/wclib.js index 48fdd05d8..f7db14842 100644 --- a/webcit/static/wclib.js +++ b/webcit/static/wclib.js @@ -132,6 +132,8 @@ function setupIconBar() { if (!document.getElementById("switch")) { return; } + _switchToRoomList = getTextContent(document.getElementById("rmlist_template")); + _switchToMenu = getTextContent(document.getElementById("mnlist_template")); var switchSpan = document.getElementById("switch").firstChild; if (switchSpan != null) { setTextContent(switchSpan, _switchToRoomList); @@ -196,7 +198,8 @@ function IconBarRoomList() { var mailboxLI = document.createElement("li"); ul.appendChild(mailboxLI); var mailboxSPAN = document.createElement("span"); - mailboxSPAN.appendChild(document.createTextNode("Mailbox")); + var _mailbox = getTextContent(document.getElementById("mbox_template")); + mailboxSPAN.appendChild(document.createTextNode(_mailbox)); $(mailboxSPAN).observe('click', expandFloorEvent); mailboxLI.appendChild(mailboxSPAN); mailboxLI.setAttribute("class", "floor"); @@ -765,7 +768,7 @@ function WCLog(msg) { } function fixMissingCSSTable(elems) { - if (elems[0] == null) { + if (elems[0] == null || elems[1] == null) { return; } if (elems[0].getStyle("display") != "table-cell") { diff --git a/webcit/static/webcit.css b/webcit/static/webcit.css index 02f2a4e2d..80dd0d2f1 100644 --- a/webcit/static/webcit.css +++ b/webcit/static/webcit.css @@ -464,10 +464,10 @@ a:visited { color: purple; } #customize a:active, #customize a:link, #customize a:visited { color: black; } -#important_message, .buttons a:hover, .msgbuttons a:hover, input: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?? */ @@ -565,6 +565,7 @@ body, #global { left: 16%; width: 84%; height: 18%; */ + min-height: 18%; } #navbar {