From: the_mgt Date: Wed, 6 Jul 2011 22:58:14 +0000 (+0200) Subject: Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel X-Git-Tag: v8.01~160 X-Git-Url: https://code.citadel.org/?a=commitdiff_plain;h=ac705a1b9f980154551ffa13084a5b9b2742a39b;hp=0700d2580a870f92008686de2cdf42b4759033ab;p=citadel.git Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel --- diff --git a/webcit/static/roomchat_unload.html b/webcit/static/roomchat_unload.html index 85988db1e..aa613c4cd 100644 --- a/webcit/static/roomchat_unload.html +++ b/webcit/static/roomchat_unload.html @@ -1,17 +1,20 @@ + - - - - - -ugly hack to enable an onUnload event - + + End Chat + + + + + ugly hack to enable an onUnload event + diff --git a/webcit/static/styles/webcit.css b/webcit/static/styles/webcit.css index 2e2ccc4c7..f5957e76c 100644 --- a/webcit/static/styles/webcit.css +++ b/webcit/static/styles/webcit.css @@ -446,19 +446,22 @@ body { /* Please avoid setting heights for any of the mailbox view elements (except summary_view * and resize). In particular, do NOT set any for message_list_hdr as its not good feng shui */ +#message_listview th { + border: 1px solid green; + border-right: 0.2em solid #fff; +} +#message_listview td { + padding-left: 1em; +} #message_list_hdr { display: block; - top: 0; - left: 0; - width: 100%; padding-bottom: 0; margin-bottom: 0; background-color: #CCCCCC; } #summary_view { - height: 100px; overflow-y: scroll; overflow-x: hidden; cursor: pointer; @@ -466,7 +469,6 @@ body { #summary_headers { background-color: white; - width: 100%; table-layout: fixed; } @@ -475,11 +477,11 @@ body { overflow-x: hidden; /* stop long subjects overflowing */ } -.col1 { width: 50% } +#message_listview .col1 { width: 66% } -.col2 { width: 30% } +#message_listview .col2 { width: 22% } -.col3 { width: 20% } +#message_listview .col3 { width: 12% } .col1, .col2, .col3 { cursor: pointer; @@ -724,17 +726,8 @@ div.auto_complete ul strong.highlight { #message_list_hdr > table { border-collapse: collapse } -#message_list_hdr > table > tbody > tr > th { - border-left: 2px solid white; - border-right: 2px solid white; -} - #summary_view > table { border-collapse: collapse } -th.col1 { border-left: none !important } - -th.col3 { border-right: none !important } - /* System Administration Menu */ ul.adminitems { diff --git a/webcit/static/summaryview.js b/webcit/static/summaryview.js index edcb3e2b8..a37776019 100644 --- a/webcit/static/summaryview.js +++ b/webcit/static/summaryview.js @@ -483,7 +483,7 @@ function sizePreviewPane() { var heightOfViewPort = document.viewport.getHeight() // prototypejs method var bannerHeight = banner.offsetHeight; var contentViewPortHeight = heightOfViewPort-banner.offsetHeight-message_list_hdr.offsetHeight; - contentViewPortHeight = 0.98 * contentViewPortHeight; // leave some error + contentViewPortHeight = 0.95 * contentViewPortHeight; // leave some error (especially for FF3!!) // Set summary_view to 20%; var summary_height = ctdlLocalPrefs.readPref("svheight"); if (summary_height == null) { diff --git a/webcit/static/t/msg_listview.html b/webcit/static/t/msg_listview.html index 223d25ea1..3d8f0545c 100644 --- a/webcit/static/t/msg_listview.html +++ b/webcit/static/t/msg_listview.html @@ -1,33 +1,31 @@ -
- - - - - - -
-
-
-
-
-

-

-
-
-
-
-
-
-
-
-
-
-
+
+
+ + + + +
+
+
+
+
+

+

+
+
+
+
+
+
+
+
+
+
+
diff --git a/webcit/static/t/vnoteitem.html b/webcit/static/t/vnoteitem.html index 5d8652539..61c6c2d03 100644 --- a/webcit/static/t/vnoteitem.html +++ b/webcit/static/t/vnoteitem.html @@ -1,64 +1,62 @@
- -
- - - -
- - - ')" - src="static/webcit_icons/closewindow.gif"> -
-
+ +
+ + + + + +
+ # + + ')" + src="static/webcit_icons/closewindow.gif" alt="x" + > +
-
- -
+
+ +
- -
- -
- - - - - - - - - - - - - - -
-
- -
+ +
+
+ + + + + + + + + + + + + + +
+
+