projects / citadel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw (from parent 2: 0700d25)
Merge branch 'master' of ssh://git.citadel.org/appl/gitroot/citadel
authorthe_mgt <themgt@ueberserver.de>
Wed, 6 Jul 2011 22:58:14 +0000 (00:58 +0200)
committerthe_mgt <themgt@ueberserver.de>
Wed, 6 Jul 2011 22:58:14 +0000 (00:58 +0200)
webcit/static/roomchat_unload.html patch | blob | history
webcit/static/styles/webcit.css patch | blob | history
webcit/static/summaryview.js patch | blob | history
webcit/static/t/msg_listview.html patch | blob | history
webcit/static/t/vnoteitem.html patch | blob | history

diff --git a/webcit/static/roomchat_unload.html b/webcit/static/roomchat_unload.html
index 85988db1eb53cd652f64f08b1c9582834427d2e3..aa613c4cda851e9fba7e098a1e9d04a4eede16bc 100644 (file)
--- a/webcit/static/roomchat_unload.html
+++ b/webcit/static/roomchat_unload.html
@@ -1,17 +1,20 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+  "http://www.w3.org/TR/html4/loose.dtd">
 <html>
-<head>
-<script type="text/javascript" src="prototype.js"></script>
-<script type="text/javascript">
-function do_roomchat_unload() {
-        new Ajax.Request(
-                '../chat_exit', {
-                        method: 'get'
-                }
-        );
-}
-</script>
-</head>
-<body onUnload="do_roomchat_unload();">
-ugly hack to enable an onUnload event
-</body>
+  <head>
+    <title>End Chat</title>
+      <script type="text/javascript" src="prototype.js"></script>
+      <script type="text/javascript">
+        function do_roomchat_unload() {
+          new Ajax.Request(
+            '../chat_exit', {
+              method: 'get'
+            }
+          );
+        }
+      </script>
+  </head>
+  <body onUnload="do_roomchat_unload();">
+   ugly hack to enable an onUnload event
+  </body>
 </html>
diff --git a/webcit/static/styles/webcit.css b/webcit/static/styles/webcit.css
index 2e2ccc4c7e53d77d4e45bdfbb8659e214885858e..f5957e76cfc23cb6e54a99f06bb0d2df9b5c3865 100644 (file)
--- 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 edcb3e2b81ce2f00b222e2712f6c21f5b3d76fc0..a377760191ef1447d7e87a4a93573853856cad94 100644 (file)
--- 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 223d25ea1379f4f0d1a8f4f70d64c99dcc339b62..3d8f0545cb9f18b37a83e766ff4232353ae398ec 100644 (file)
--- a/webcit/static/t/msg_listview.html
+++ b/webcit/static/t/msg_listview.html
@@ -1,33 +1,31 @@
 <script src="static/summaryview.js" type="text/javascript"></script>
 <script type="text/javascript">
-var is_safe_mode = <?%("COND:PREF", 1, :"mailbox", "client-nosort",
-"true", "false")>;
-var sortmode = ""; /*"<?PREF:ROOM:VALUE("sort")>";*/
+       var is_safe_mode = <?%("COND:PREF", 1, :"mailbox", "client-nosort", "true", "false")>;
+       var sortmode = ""; /*"<?PREF:ROOM:VALUE("sort")>";*/
 </script>
-<div id="message_list_hdr">
-<table>
-      <tr>
-       <th class="col1" id="mlh_subject"><?_("Subject")></th>
-       <th class="col2" id="mlh_from"><?_("Sender")></th>
-       <th class="col3" id="mlh_date"><?_("Date")></th>
-      </tr>
-       </table>
-</div>
-<div id="summary_view">
-  <table id="message_list_body" class="mailbox_summary"><tr style="display: none;"><td colspan="4"></td></tr></table>
-    <div id="loading">
-      <p><img src="static/webcit_icons/throbber.gif" alt=""></p>
-      <p><?_("Loading messages from server, please wait")></p>
-    </div>
-</div>
-<div id="resize_msglist"></div>
-<div id="preview_pane">
-</div>
-<div class="ctdlTemplate" id="listViewContextMenu">
-<?_("Open in new window")><br>
-<?_("Move")><br>
-<?_("Copy")><br>
-<?_("Delete")><br>
-<?_("Print")><br>
+<div id="message_listview">
+       <div id="message_list_hdr">      
+               <table><tr>
+                       <th class="col1" id="mlh_subject"><?_("Subject")></th>
+                       <th class="col2" id="mlh_from"><?_("Sender")></th>
+                       <th class="col3" id="mlh_date"><?_("Date")></th>
+               </tr></table>
+       </div>
+       <div id="summary_view">
+               <table id="message_list_body" class="mailbox_summary"><tr style="display: none;"><td colspan="4"></td></tr></table>
+               <div id="loading">
+                       <p><img src="static/webcit_icons/throbber.gif" alt=""></p>
+                       <p><?_("Loading messages from server, please wait")></p>
+               </div>
+       </div>
+       <div id="resize_msglist"></div>
+       <div id="preview_pane"></div>
+       <div class="ctdlTemplate" id="listViewContextMenu">
+               <?_("Open in new window")><br>
+               <?_("Move")><br>
+               <?_("Copy")><br>
+               <?_("Delete")><br>
+               <?_("Print")><br>
+       </div>
 </div>
 </div>
diff --git a/webcit/static/t/vnoteitem.html b/webcit/static/t/vnoteitem.html
index 5d8652539303bd7e4724151cde7f6399af31d05c..61c6c2d03606ee2b19ef0acb4fbef7d7abe9a0c2 100644 (file)
--- a/webcit/static/t/vnoteitem.html
+++ b/webcit/static/t/vnoteitem.html
@@ -1,64 +1,62 @@
 <div id="note-<?VNOTE:UID>"
- class="stickynote_outer"
- style=" left: <?VNOTE:POS:LEFT>px; top: <?VNOTE:POS:TOP>px; width: <?VNOTE:POS:WIDTH>px; height: <?VNOTE:POS:HEIGHT>px; background-color: #<?VNOTE:COLOR>">
-<!--begin title bar div-->
-<div id='titlebar-<?VNOTE:UID>'
- class="stickynote_titlebar"
- onMouseDown="NotesDragMouseDown(event,'<?VNOTE:UID>')"
- style=" background-color: #<?VNOTE:BGCOLOR>"
+       class="stickynote_outer"
+       style=" left: <?VNOTE:POS:LEFT>px; top: <?VNOTE:POS:TOP>px; width: <?VNOTE:POS:WIDTH>px; height: <?VNOTE:POS:HEIGHT>px; background-color: #<?VNOTE:COLOR>"
 >
-<table border=0 cellpadding=0 cellspacing=0 valign=middle width=100%><tr>
-<td align=left valign=middle>
-<img onclick="NotesClickPalette(event,'<?VNOTE:UID>')" src="static/webcit_icons/8paint16.gif">
-</td>
-<td></td><!-- nothing in the title bar, its just for dragging-->
-<td align=right valign=middle>
- <img onclick="DeleteStickyNote(event,'<?VNOTE:UID>','<?_("Delete this note?")>')"
-  src="static/webcit_icons/closewindow.gif">
-</td></tr></table>
-</div>
+<!--begin title bar div-->
+       <div id='titlebar-<?VNOTE:UID>'
+               class="stickynote_titlebar"
+               onMouseDown="NotesDragMouseDown(event,'<?VNOTE:UID>')"
+               style=" background-color: #<?VNOTE:BGCOLOR>"
+       ><table border="0" cellpadding="0" cellspacing="0" width="100%">
+               <tr>
+                       <td align="left">
+                               <img onclick="NotesClickPalette(event,'<?VNOTE:UID>')" src="static/webcit_icons/8paint16.gif" alt="#">
+                       </td>
+                       <td></td><!-- nothing in the title bar, its just for dragging-->
+                       <td align="right">
+                               <img onclick="DeleteStickyNote(event,'<?VNOTE:UID>','<?_("Delete this note?")>')"
+                                       src="static/webcit_icons/closewindow.gif" alt="x"
+                               >
+                       </td>
+               </tr>
+       </table></div>
 <!--end title bar div; begin body div-->
-<div id="notebody-<?VNOTE:UID>"        class="stickynote_body">
-  <?VNOTE:MSG("X")>
-</div>
+       <div id="notebody-<?VNOTE:UID>" class="stickynote_body">
+               <?VNOTE:MSG("X")>
+       </div>
 <!--end body div-->
-<script type="text/javascript">
-  new Ajax.InPlaceEditor('notebody-<?VNOTE:UID>', 'ajax_update_note?note_uid=<?VNOTE:UID>',
-{
- rows:<?VNOTE:POS:HEIGHT2>,
- cols:<?VNOTE:POS:WIDTH2>,
- onEnterHover:false,
- onLeaveHover:false,
- okText:'<?_("Save")>',
- cancelText:'<?_("Cancel")>',
- clickToEditText:'<?_("Click on any note to edit it.")>'
-});
-</script>
-<div id="resize-<?VNOTE:UID>" 
-     class="stickynote_resize" onMouseDown="NotesResizeMouseDown(event,'<?VNOTE:UID>')"> </div>
-
-<div id="palette-<?VNOTE:UID>" class="stickynote_palette">
-  <table border=0 cellpadding=0 cellspacing=0>
-    <tr>
-      <td onClick="NotesClickColor(event,'<?VNOTE:UID>',128,128,128,'#808080','#404040')" bgcolor="#808080"> </td>
-      <td onClick="NotesClickColor(event,'<?VNOTE:UID>',255,128,128,'#ff8080','#7f4040')" bgcolor="#ff8080"> </td>
-      <td onClick="NotesClickColor(event,'<?VNOTE:UID>',128,128,255,'#8080ff','#40407f')" bgcolor="#8080ff"> </td>
-    </tr><tr>
-      <td onClick="NotesClickColor(event,'<?VNOTE:UID>',255,255,128,'#ffff80','#7f7f40')" bgcolor="#ffff80"> </td>
-      <td onClick="NotesClickColor(event,'<?VNOTE:UID>',128,255,128,'#80ff80','#407f40')" bgcolor="#80ff80"> </td>
-      <td onClick="NotesClickColor(event,'<?VNOTE:UID>',255,128,255,'#ff80ff','#7f407f')" bgcolor="#ff80ff"> </td>
-    </tr><tr>
-      <td onClick="NotesClickColor(event,'<?VNOTE:UID>',128,255,255,'#80ffff','#407f7f')" bgcolor="#80ffff"> </td>
-      <td onClick="NotesClickColor(event,'<?VNOTE:UID>',255,128,128,'#ff8080','#7f4040')" bgcolor="#ff8080"> </td>
-      <td onClick="NotesClickColor(event,'<?VNOTE:UID>',128,128,128,'#808080','#404040')" bgcolor="#808080"> </td>
-    </tr>
-  </table>
-</div></div>
-
-<div id="resize-<?VNOTE:UID>"
- class="stickynote_resize"
- onMouseDown="NotesResizeMouseDown(event,'<?VNOTE:UID>')">
+       <script type="text/javascript">
+               new Ajax.InPlaceEditor('notebody-<?VNOTE:UID>', 'ajax_update_note?note_uid=<?VNOTE:UID>',
+               {
+                       rows:<?VNOTE:POS:HEIGHT2>,
+                       cols:<?VNOTE:POS:WIDTH2>,
+                       onEnterHover:false,
+                       onLeaveHover:false,
+                       okText:'<?_("Save")>',
+                       cancelText:'<?_("Cancel")>',
+                       clickToEditText:'<?_("Click on any note to edit it.")>'
+               });
+       </script>
+       <div id="resize-<?VNOTE:UID>" class="stickynote_resize" onMouseDown="NotesResizeMouseDown(event,'<?VNOTE:UID>')"> </div>
+       <div id="palette-<?VNOTE:UID>" class="stickynote_palette">
+               <table border="0" cellpadding="0" cellspacing="0">
+                       <tr>
+                               <td onClick="NotesClickColor(event,'<?VNOTE:UID>',128,128,128,'#808080','#404040')" bgcolor="#808080"> </td>
+                               <td onClick="NotesClickColor(event,'<?VNOTE:UID>',255,128,128,'#ff8080','#7f4040')" bgcolor="#ff8080"> </td>
+                               <td onClick="NotesClickColor(event,'<?VNOTE:UID>',128,128,255,'#8080ff','#40407f')" bgcolor="#8080ff"> </td>
+                       </tr><tr>
+                               <td onClick="NotesClickColor(event,'<?VNOTE:UID>',255,255,128,'#ffff80','#7f7f40')" bgcolor="#ffff80"> </td>
+                               <td onClick="NotesClickColor(event,'<?VNOTE:UID>',128,255,128,'#80ff80','#407f40')" bgcolor="#80ff80"> </td>
+                               <td onClick="NotesClickColor(event,'<?VNOTE:UID>',255,128,255,'#ff80ff','#7f407f')" bgcolor="#ff80ff"> </td>
+                       </tr><tr>
+                               <td onClick="NotesClickColor(event,'<?VNOTE:UID>',128,255,255,'#80ffff','#407f7f')" bgcolor="#80ffff"> </td>
+                               <td onClick="NotesClickColor(event,'<?VNOTE:UID>',255,128,128,'#ff8080','#7f4040')" bgcolor="#ff8080"> </td>
+                               <td onClick="NotesClickColor(event,'<?VNOTE:UID>',128,128,128,'#808080','#404040')" bgcolor="#808080"> </td>
+                       </tr>
+               </table>
+       </div>
 </div>
+<div id="resize-<?VNOTE:UID>" class="stickynote_resize" onMouseDown="NotesResizeMouseDown(event,'<?VNOTE:UID>')"></div>
 <!--end resize handle div-->
 
 
Citadel server, clients, utilities