* 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 361c19752456bbe4eb81bd8acaa41f8982c58461..b62dd374a310531c61a2099b2d710bb0a4a2c22a 100644 (file)
--- 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 677fa66c1fb545e4e52eb4146aa9f65b9f1b8bb0..6011b116e99298be20155eadd49216638e4dc4bc 100644 (file)
--- a/webcit/roomops.c
+++ b/webcit/roomops.c
@@ -3645,8 +3645,9 @@ void knrooms(void)
                wprintf(_("Room list"));
        }
        wprintf("</h1></div>\n");
-
+       
        /** offer the ability to switch views */
+       wprintf("<div id=\"actiondiv\">");
        wprintf("<ul class=\"room_actions\">\n");
        wprintf("<li class=\"start_page\">");
        offer_start_page(NULL, &NoCtx);
@@ -3670,7 +3671,7 @@ void knrooms(void)
 
        wprintf("</select>");
        wprintf("</form></li>");
-       wprintf("</ul></div>\n");
+       wprintf("</ul></div></div>\n");
 
        wprintf("<div id=\"content\" class=\"service\">\n");
 

diff --git a/webcit/static/summaryview.js b/webcit/static/summaryview.js
index 9132c33d4fea0a121b4ea929cabb061c8281d0fe..8f3a479cd67a91cc93e45443c3d11a043e40fe5b 100644 (file)
--- 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 f50994152bb4a55fae5cab64462bf05bed67c1e6..405281792c76e7200d752b043a208a4410d8f873 100644 (file)
--- a/webcit/static/t/edit_message.html
+++ b/webcit/static/t/edit_message.html
@@ -1,7 +1,6 @@
 <?=("head")>
 <?=("important_msg")>
 <?ROOMBANNER>
-</div>
 <div id="content">
 <div class="fix_scrollbar_bug message "><form enctype="multipart/form-data" method="POST" accept-charset="UTF-8" action="post" name="enterform">
 <input type="hidden" name="postseq" value="<?DATE:NOW:NO>">
@@ -123,7 +122,7 @@
  activate_entmsg_autocompleters();     
 
 </script>
-
+</div>
 </div>
 </div>
 <?=("addressbook_popup")>

diff --git a/webcit/static/t/iconbar.html b/webcit/static/t/iconbar.html
index 6ec4938e5d94d38d8a07a2b42bfe1cf3fd9c93e7..dc25d8b8965868f51646ea30b9e2500b8068c766 100644 (file)
--- a/webcit/static/t/iconbar.html
+++ b/webcit/static/t/iconbar.html
@@ -79,4 +79,9 @@ title="<?_("Log off")>">
 <div id="customize" class="iconbar_text">
   <span><a href="display_customize_iconbar"><?_("customize this menu")></a></span>
 </div>
+<div class="ctdlTemplate">
+<span id="rmlist_template"><?_("switch to room list")></span>
+<span id="mnlist_template"><?_("switch to menu")></span>
+<span id="mbox_template"><?_("My folders")></span>
+</div>
 </div>

diff --git a/webcit/static/t/preferences.html b/webcit/static/t/preferences.html
index fcb23f77ab3721ec13fc2083af2ebea3b5404c5e..6bfb18fc064d0e81bcf0394fe72cc199154e87d6 100644 (file)
--- a/webcit/static/t/preferences.html
+++ b/webcit/static/t/preferences.html
@@ -1,6 +1,7 @@
 <?=("head")>
 <?=("important_msg")>
 <div id="banner">
+  <h1><?_("Preferences and settings")></h1>
 </div>
 <div id="content" class="service">
 <?DOBOXED("box_preferences", _("Preferences and settings"))>

diff --git a/webcit/static/wclib.js b/webcit/static/wclib.js
index 48fdd05d83d9fcfc31dd48ec3f3f4975d576ff0e..f7db14842e728dd7565401bed530cba5f38dd655 100644 (file)
--- 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 02f2a4e2d1a560cb3b6b7e21f03aca9ae8bfda46..80dd0d2f1d26f49694488dfe9a9a93a78d4f6812 100644 (file)
--- 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 {