From 875d526e1d761ac2228cd8ad904d0fc9376dbfdd Mon Sep 17 00:00:00 2001
From: znek <znek@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Fri, 22 Jul 2005 11:11:21 +0000
Subject: [PATCH] Fixed layout of inline attachment list so that SOGo bug #1466
 can be closed now.

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@888 d1b88da0-ebda-0310-925b-ed51d893ca5b
---
 SOGo/SOGo.xcodeproj/project.pbxproj           |  10 +-
 SOGo/UI/Templates/ChangeLog                   |   5 +
 SOGo/UI/Templates/MailerUI/UIxMailEditor.wox  | 164 +++---
 SOGo/UI/WebServerResources/ChangeLog          |  12 +
 SOGo/UI/WebServerResources/layout2or3_xlib.js |   3 +
 .../UI/WebServerResources/layout2or3_xlib.txt | 511 ++++++++++++++++++
 SOGo/UI/WebServerResources/mailer-compose.css |  19 +-
 SOGo/UI/WebServerResources/mailer.js          |   6 +-
 8 files changed, 636 insertions(+), 94 deletions(-)
 create mode 100644 SOGo/UI/WebServerResources/layout2or3_xlib.js
 create mode 100644 SOGo/UI/WebServerResources/layout2or3_xlib.txt

diff --git a/SOGo/SOGo.xcodeproj/project.pbxproj b/SOGo/SOGo.xcodeproj/project.pbxproj
index 75d50af9..9c8caeaf 100644
--- a/SOGo/SOGo.xcodeproj/project.pbxproj
+++ b/SOGo/SOGo.xcodeproj/project.pbxproj
@@ -122,6 +122,9 @@
 		AD3D68D3088FADA200CBB51B /* UIxMailListView.js */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.javascript; path = UIxMailListView.js; sourceTree = "<group>"; };
 		AD3D68F7088FB57100CBB51B /* UIxMailEditorAttach.js */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.javascript; path = UIxMailEditorAttach.js; sourceTree = "<group>"; tabWidth = 2; };
 		AD3D696E088FC09F00CBB51B /* ChangeLog */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 8; lastKnownFileType = text; name = ChangeLog; path = ../WebServerResources/ChangeLog; sourceTree = "<group>"; usesTabs = 1; };
+		AD3D6A470890F9FE00CBB51B /* mailer-compose.css */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = "mailer-compose.css"; sourceTree = "<group>"; };
+		AD3D6A480890F9FE00CBB51B /* mailer-toolbar.css */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = text; path = "mailer-toolbar.css"; sourceTree = "<group>"; };
+		AD3D6A91089107DF00CBB51B /* layout2or3_xlib.js */ = {isa = PBXFileReference; fileEncoding = 5; lastKnownFileType = sourcecode.javascript; path = layout2or3_xlib.js; sourceTree = "<group>"; };
 		AD494C6206F5EA6600E51EC9 /* UIxContactSelector.m */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = UIxContactSelector.m; sourceTree = "<group>"; };
 		AD494C8E06F606F900E51EC9 /* UIxContactsSelectionView.m */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.objc; path = UIxContactsSelectionView.m; sourceTree = "<group>"; };
 		AD494D1806F6EB3A00E51EC9 /* SOGoMailAccount.h */ = {isa = PBXFileReference; fileEncoding = 5; indentWidth = 2; lastKnownFileType = sourcecode.c.h; path = SOGoMailAccount.h; sourceTree = "<group>"; };
@@ -543,6 +546,7 @@
 				ADE0AC120885C45100E62D67 /* generic.js */,
 				ADE0AC140885C45100E62D67 /* mailer.js */,
 				ADE0AC150885C45100E62D67 /* searchfield.js */,
+				AD3D6A91089107DF00CBB51B /* layout2or3_xlib.js */,
 				AD3D63CF088D5EB000CBB51B /* UIxAppointmentEditor.js */,
 				AD3D63D0088D5EB000CBB51B /* UIxContactEditor.js */,
 				AD3D68D3088FADA200CBB51B /* UIxMailListView.js */,
@@ -620,9 +624,11 @@
 		AD3D68D6088FADAA00CBB51B /* CSS */ = {
 			isa = PBXGroup;
 			children = (
-				ADE0AC130885C45100E62D67 /* mailer.css */,
-				AD3D63CE088D5EB000CBB51B /* calendar.css */,
 				ADE0AC160885C45100E62D67 /* uix.css */,
+				AD3D63CE088D5EB000CBB51B /* calendar.css */,
+				ADE0AC130885C45100E62D67 /* mailer.css */,
+				AD3D6A470890F9FE00CBB51B /* mailer-compose.css */,
+				AD3D6A480890F9FE00CBB51B /* mailer-toolbar.css */,
 			);
 			name = CSS;
 			path = ../WebServerResources;
diff --git a/SOGo/UI/Templates/ChangeLog b/SOGo/UI/Templates/ChangeLog
index 13eb8b91..44dc1926 100644
--- a/SOGo/UI/Templates/ChangeLog
+++ b/SOGo/UI/Templates/ChangeLog
@@ -1,3 +1,8 @@
+2005-07-22  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+	* UIxMailEditor.wox: added inclusion of layout2or3_xlib.js and added
+	  a new id to compose_table
+
 2005-07-21  Marcus Mueller  <znek@mulle-kybernetik.com>
 
 	* UIxCalDayOverview.wox, UIxCalDayChartview.wox, UIxCalDayListview.wox,
diff --git a/SOGo/UI/Templates/MailerUI/UIxMailEditor.wox b/SOGo/UI/Templates/MailerUI/UIxMailEditor.wox
index 8bef375f..2a3d3a33 100644
--- a/SOGo/UI/Templates/MailerUI/UIxMailEditor.wox
+++ b/SOGo/UI/Templates/MailerUI/UIxMailEditor.wox
@@ -1,88 +1,88 @@
 <?xml version='1.0' standalone='yes'?>
-<var:component
-  xmlns="http://www.w3.org/1999/xhtml"
-  xmlns:var="http://www.skyrix.com/od/binding"
-  xmlns:const="http://www.skyrix.com/od/constant"
-  xmlns:uix="OGo:uix"
-  xmlns:rsrc="OGo:url"
-  xmlns:label="OGo:label"
-  className="UIxMailPanelFrame"
-  title="panelTitle"
+<var:component xmlns="http://www.w3.org/1999/xhtml"
+               xmlns:var="http://www.skyrix.com/od/binding"
+               xmlns:const="http://www.skyrix.com/od/constant"
+               xmlns:uix="OGo:uix"
+               xmlns:rsrc="OGo:url"
+               xmlns:label="OGo:label"
+               className="UIxMailPanelFrame"
+               title="panelTitle"
 >
- <div id="compose_panel">
-
-  <var:if condition="showInternetMarker">
-    <div id="compose_internetmarker">
-      <var:string
-          label:value="This mail is being sent from an unsecure network!" />
-    </div>
-  </var:if>
-  
-  <table border="0" width="100%">
-    <tr>
-      <td id="compose_leftside" var:style="initialLeftsideStyle">
-        <div id="compose_toselection">
-          <var:component className="UIxMailToSelection"
-                         to="to"
-                         cc="cc"
-                         bcc="bcc"
-          />
-        </div>
-        <!-- moved below to selection to make it look better -->
-        <div id="compose_fromline">
-          <table border="0" width="100%">
-            <tr>
-              <td class="compose_label" width="20%">
-                <var:string label:value="From" />:
-              </td>
-              <td width="80%">
-                <var:popup const:name="from" list="fromEMails" item="item"
-                           selection="from"
-                           const:style="width: 100%; font-size: 8pt;"
-                  />
-              </td>
-            </tr>
-          </table>
-        </div>
-
-        <div id="compose_subject">
-          <table border="0" width="100%">
-            <tr>
-              <td class="compose_label" width="20%">
-                <var:string label:value="Subject" />:
-              </td>
-              <td width="80%"><input name="subject" 
-                                     id="compose_subject_input" type="text" 
-      			       var:value="subject" /></td>
-            </tr>
-          </table>
-        </div>
-      </td>
-      <td id="compose_rightside" var:style="initialRightsideStyle">
-        <div id="compose_attachments">
-          <div id="compose_attachments_header">  
-            <span class="compose_label"
-            ><var:string label:value="Attachments" />:</span>
-             <!--<a href="#"
-                onclick="hideInlineAttachmentList(this);"
-             ><var:string label:value="close" /></a>-->
+  <script rsrc:src="layout2or3_xlib.js" > <!-- space required --></script>
+  <div id="compose_panel">
+    <var:if condition="showInternetMarker">
+      <div id="compose_internetmarker">
+        <var:string
+            label:value="This mail is being sent from an unsecure network!" />
+      </div>
+    </var:if>
+    <table border="0" width="100%" id="compose_table">
+      <tr>
+        <td id="compose_leftside" var:style="initialLeftsideStyle">
+          <div id="compose_toselection">
+            <var:component className="UIxMailToSelection"
+                           to="to"
+                           cc="cc"
+                           bcc="bcc"
+            />
           </div>
-          <div id="compose_attachments_list"
-               onclick="clickedEditorAttach(this);"
-          >
-            <var:foreach list="attachmentNames" item="attachmentName">
-              <var:string value="attachmentName" /><br />
-            </var:foreach>
+          <!-- moved below to selection to make it look better -->
+          <div id="compose_fromline">
+            <table border="0" width="100%">
+              <tr>
+                <td class="compose_label" width="20%">
+                  <var:string label:value="From" />:
+                </td>
+                <td width="80%">
+                  <var:popup const:name="from" list="fromEMails" item="item"
+                             selection="from"
+                             const:style="width: 100%; font-size: 8pt;"
+                    />
+                </td>
+              </tr>
+            </table>
           </div>
-        </div>
-      </td>
-    </tr>
-  </table>
-  <!-- separator line -->
-  <div id="compose_text">
-    <textarea name="content" var:value="text" />
-  </div>
+    
+          <div id="compose_subject">
+            <table border="0" width="100%">
+              <tr>
+                <td class="compose_label" width="20%">
+                  <var:string label:value="Subject" />:
+                </td>
+                <td width="80%"><input name="subject"
+                                       id="compose_subject_input"
+                                       type="text"
+                                       var:value="subject"
+                                /></td>
+              </tr>
+            </table>
+          </div>
+        </td>
+        <td id="compose_rightside" var:style="initialRightsideStyle">
+          <div id="compose_attachments">
+            <div id="compose_attachments_header">  
+              <span class="compose_label"
+              ><var:string label:value="Attachments" />:</span>
+               <!--<a href="#"
+                  onclick="hideInlineAttachmentList(this);"
+               ><var:string label:value="close" /></a>-->
+            </div>
+            <div id="compose_attachments_list"
+                 onclick="clickedEditorAttach(this);"
+            >
+              <var:foreach list="attachmentNames" item="attachmentName">
+                <var:string value="attachmentName" /><br />
+              </var:foreach>
+            </div>
+          </div>
+        </td>
+      </tr>
+    </table>
+    <!-- separator line -->
+    <div id="compose_text">
+      <textarea name="content" var:value="text" />
+    </div>
 
-  <!-- img rsrc:src="tbird_073_compose.png" alt="screenshot" / -->
- </div>
+    <!-- img rsrc:src="tbird_073_compose.png" alt="screenshot" / -->
+  </div>
 </var:component>
diff --git a/SOGo/UI/WebServerResources/ChangeLog b/SOGo/UI/WebServerResources/ChangeLog
index f96a9c98..b44f8c29 100644
--- a/SOGo/UI/WebServerResources/ChangeLog
+++ b/SOGo/UI/WebServerResources/ChangeLog
@@ -1,3 +1,15 @@
+2005-07-22  Marcus Mueller  <znek@mulle-kybernetik.com>
+
+	* layout2or3_xlib.js: added (currently used by UIxMailToEditor for
+	  height calculation)
+	  
+	* layout2or3_xlib.txt: added, contains documentation/license for
+	  layout2or3_xlib.js
+
+	* mailer-compose.css: fixed padding for table entries
+
+	* mailer.js: moved layout2or3_xlib JavaScript to own file
+
 2005-07-21  Helge Hess  <helge.hess@opengroupware.org>
 
 	* mailer.css: moved compose styles to own file, mailer-compose.css
diff --git a/SOGo/UI/WebServerResources/layout2or3_xlib.js b/SOGo/UI/WebServerResources/layout2or3_xlib.js
new file mode 100644
index 00000000..70897832
--- /dev/null
+++ b/SOGo/UI/WebServerResources/layout2or3_xlib.js
@@ -0,0 +1,3 @@
+/* X Library, Copyright (C) 2001,2002,2003,2004,2005 Michael Foster (Cross-Browser.com). Distributed under the terms of the GNU LGPL */
+/* layout2or3_xlib.js compiled with XC v0.22b, see layout2or3_xlib.txt for contributor copyrights, license info and documentation */
+var xVersion='4.0',xOp7,xOp5or6,xIE4Up,xIE4,xIE5,xNN4,xMoz,xMac,xUA=navigator.userAgent.toLowerCase();if (window.opera){xOp7=(xUA.indexOf('opera 7')!=-1 || xUA.indexOf('opera/7')!=-1);if (!xOp7) xOp5or6=(xUA.indexOf('opera 5')!=-1 || xUA.indexOf('opera/5')!=-1 || xUA.indexOf('opera 6')!=-1 || xUA.indexOf('opera/6')!=-1);}else if (document.all && xUA.indexOf('msie')!=-1) {xIE4Up=parseInt(navigator.appVersion)>=4;xIE4=xUA.indexOf('msie 4')!=-1;xIE5=xUA.indexOf('msie 5')!=-1;}else if (document.layers) {xNN4=true;}xMoz=xUA.indexOf('gecko')!=-1;xMac=xUA.indexOf('mac')!=-1;function xGetElementById(e){if(typeof(e)!='string') return e;if(document.getElementById) e=document.getElementById(e);else if(document.all) e=document.all[e];else e=null;return e;}function xStr(s){for(var i=0; i<arguments.length; ++i){if(typeof(arguments[i])!='string') return false;}return true;}function xScrollLeft(e, bWin){var offset=0;if (!xDef(e) || bWin) {var w = e || window;if(w.document.documentElement && w.document.documentElement.scrollLeft) offset=w.document.documentElement.scrollLeft;else if(w.document.body && xDef(w.document.body.scrollLeft)) offset=w.document.body.scrollLeft;}else {e = xGetElementById(e);if (e && xNum(e.scrollLeft)) offset = e.scrollLeft;}return offset;}function xScrollTop(e, bWin){var offset=0;if (!xDef(e) || bWin) {var w = e || window;if(w.document.documentElement && w.document.documentElement.scrollTop) offset=w.document.documentElement.scrollTop;else if(w.document.body && xDef(w.document.body.scrollTop)) offset=w.document.body.scrollTop;}else {e = xGetElementById(e);if (e && xNum(e.scrollTop)) offset = e.scrollTop;}return offset;}function xHeight(e,h){if(!(e=xGetElementById(e))) return 0;if (xNum(h)) {if (h<0) h = 0;else h=Math.round(h);}else h=-1;var css=xDef(e.style);if(css && xDef(e.offsetHeight) && xStr(e.style.height)) {if(h>=0) {var pt=0,pb=0,bt=0,bb=0;if (document.compatMode=='CSS1Compat') {var gcs = xGetComputedStyle;pt=gcs(e,'padding-top',1);if (pt != null) {pb=gcs(e,'padding-bottom',1);bt=gcs(e,'border-top-width',1);bb=gcs(e,'border-bottom-width',1);}else if(xDef(e.offsetHeight,e.style.height)){e.style.height=h+'px';pt=e.offsetHeight-h;}}h-=(pt+pb+bt+bb);if(isNaN(h)||h<0) return;else e.style.height=h+'px';}h=e.offsetHeight;}else if(css && xDef(e.style.pixelHeight)) {if(h>=0) e.style.pixelHeight=h;h=e.style.pixelHeight;}return h;}function xClientWidth(){var w=0;if(xOp5or6) w=window.innerWidth;else if(document.compatMode == 'CSS1Compat' && !window.opera && document.documentElement && document.documentElement.clientWidth)w=document.documentElement.clientWidth;else if(document.body && document.body.clientWidth)w=document.body.clientWidth;else if(xDef(window.innerWidth,window.innerHeight,document.height)) {w=window.innerWidth;if(document.height>window.innerHeight) w-=16;}return w;}function xClientHeight(){var h=0;if(xOp5or6) h=window.innerHeight;else if(document.compatMode == 'CSS1Compat' && !window.opera && document.documentElement && document.documentElement.clientHeight)h=document.documentElement.clientHeight;else if(document.body && document.body.clientHeight)h=document.body.clientHeight;else if(xDef(window.innerWidth,window.innerHeight,document.width)) {h=window.innerHeight;if(document.width>window.innerWidth) h-=16;}return h;}function xAddEventListener(e,eT,eL,cap){if(!(e=xGetElementById(e))) return;eT=eT.toLowerCase();if((!xIE4Up && !xOp7 /* && !xMoz */) && e==window) {if(eT=='resize') { window.xPCW=xClientWidth(); window.xPCH=xClientHeight(); window.xREL=eL; xResizeEvent(); return; }if(eT=='scroll') { window.xPSL=xScrollLeft(); window.xPST=xScrollTop(); window.xSEL=eL; xScrollEvent(); return; }}var eh='e.on'+eT+'=eL';if(e.addEventListener) e.addEventListener(eT,eL,cap);else if(e.attachEvent) e.attachEvent('on'+eT,eL);else eval(eh);}function xResizeEvent(){if (window.xREL) setTimeout('xResizeEvent()', 250);var cw = xClientWidth(), ch = xClientHeight();if (window.xPCW != cw || window.xPCH != ch) { window.xPCW = cw; window.xPCH = ch; if (window.xREL) window.xREL(); }}function xScrollEvent(){if (window.xSEL) setTimeout('xScrollEvent()', 250);var sl = xScrollLeft(), st = xScrollTop();if (window.xPSL != sl || window.xPST != st) { window.xPSL = sl; window.xPST = st; if (window.xSEL) window.xSEL(); }}function xGetComputedStyle(oEle, sProp, bInt){var s, p = 'undefined';var dv = document.defaultView;if(dv && dv.getComputedStyle){s = dv.getComputedStyle(oEle,'');if (s) p = s.getPropertyValue(sProp);}else if(oEle.currentStyle) {var a = sProp.split('-');sProp = a[0];for (var i=1; i<a.length; ++i) {c = a[i].charAt(0);sProp += a[i].replace(c, c.toUpperCase());}   p = oEle.currentStyle[sProp];}else return null;return bInt ? (parseInt(p) || 0) : p;}function xShow(e) {return xVisibility(e,1);}function xDef(){for(var i=0; i<arguments.length; ++i){if(typeof(arguments[i])=='undefined') return false;}return true;}function xNum(){for(var i=0; i<arguments.length; ++i){if(isNaN(arguments[i]) || typeof(arguments[i])!='number') return false;}return true;}function xVisibility(e, bShow){if(!(e=xGetElementById(e))) return null;if(e.style && xDef(e.style.visibility)) {if (xDef(bShow)) e.style.visibility = bShow ? 'visible' : 'hidden';return e.style.visibility;}return null;}
\ No newline at end of file
diff --git a/SOGo/UI/WebServerResources/layout2or3_xlib.txt b/SOGo/UI/WebServerResources/layout2or3_xlib.txt
new file mode 100644
index 00000000..68f4af20
--- /dev/null
+++ b/SOGo/UI/WebServerResources/layout2or3_xlib.txt
@@ -0,0 +1,511 @@
+
+------------------------------------------------------------------------------
+X Library, Copyright (C) 2001,2002,2003,2004,2005 Michael Foster (Cross-Browser.com). 
+Distributed under the terms of the GNU LGPL. This file contains contributor copyrights,
+license information and documentation for a customized X library.
+
+This library is free software; you can redistribute it and/or
+modify it under the terms of the GNU Lesser General Public
+License as published by the Free Software Foundation; either
+version 2.1 of the License, or (at your option) any later version.
+
+This library is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+Lesser General Public License for more details.
+
+You should have received a copy of the GNU Lesser General Public
+License along with this library; if not, write to the Free Software
+Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+layout2or3_xlib.txt compiled with XC v0.22b for layout2or3_xlib.js
+
+------------------------------------------------------------------------------
+globals, Copyright (C) 2001,2002,2003,2004,2005 Michael Foster (Cross-Browser.com)
+
+[Revisions]
+
+  r2, ?, mf, added more sniffer vars
+  r1, 31Mar04, mf, put in it's own file for use with XC
+
+[Description]
+
+  The following global variables are available.
+
+  xVersion - X version string (in _header.js)
+
+  xUA - lowercase user-agent string
+  xIE4Up - true if browser is IE 4 or greater
+  xIE4 - true if browser is IE 4.x
+  xIE5 - true if browser is IE 5.x
+  xNN4 - true if browser is Netscape Navigator 4.x
+  xOp5or6 - true if browser is Opera 5.x or 6.x
+  xOp7 - true if browser is Opera 7.x
+  xMoz - true if browser is Mozilla, etc.
+  xMac - true if OS is Mac 
+
+  For some browsers, the window resize and scroll events are simulated.
+  Some of the following variables may be used.
+
+  xPCW - previous clientWidth
+  xPCH - previous clientHeight
+  xREL - resize event listener
+  xPSL - previous scrollLeft
+  xPST - previous scrollTop
+  xSEL - scroll event listener
+
+[Invocation]
+
+
+[Parameters]
+
+
+[Return]
+
+
+[Dependencies]
+
+
+[Demos]
+
+
+[Notes]
+
+  As much as possible, object-detection is used instead of browser-detection.
+
+
+------------------------------------------------------------------------------
+xGetElementById, Copyright (C) 2001,2002,2003,2004,2005 Michael Foster (Cross-Browser.com)
+
+[Revisions]
+
+  r1, 31Mar04, mf, put in it's own file for use with XC
+
+[Description]
+
+
+[Invocation]
+
+  xGetElementById(ele)
+
+[Parameters]
+
+  ele - id string or object reference
+
+[Return]
+
+
+[Dependencies]
+
+
+[Demos]
+
+
+[Notes]
+
+
+------------------------------------------------------------------------------
+xStr, Copyright (C) 2001,2002,2003,2004,2005 Michael Foster (Cross-Browser.com)
+
+[Revisions]
+
+  r1, 31Mar04, mf, put in it's own file for use with XC
+
+[Description]
+
+
+[Invocation]
+
+  xStr(ref[, etc])
+
+[Parameters]
+
+
+[Return]
+
+  Returns true if all its arguments are 'string' type.
+
+[Dependencies]
+
+
+[Demos]
+
+
+[Notes]
+
+
+------------------------------------------------------------------------------
+xScrollLeft, Copyright (C) 2001,2002,2003,2004,2005 Michael Foster (Cross-Browser.com)
+
+[Revisions]
+
+  r2, ?, mf, added external window support
+  r1, 31Mar04, mf, put in it's own file for use with XC
+
+[Description]
+
+
+[Invocation]
+
+  xScrollLeft(e, bWin)
+
+[Parameters]
+
+  ele - id string or object reference. If undefined return document scrollLeft.
+
+[Return]
+
+  Return the number of pixels the element (or window) has scrolled horizontally.
+
+[Dependencies]
+
+  xGetElementById, xDef, xNum
+
+[Demos]
+
+
+[Notes]
+
+
+------------------------------------------------------------------------------
+xScrollTop, Copyright (C) 2001,2002,2003,2004,2005 Michael Foster (Cross-Browser.com)
+
+[Revisions]
+
+  r2, ?, mf, added external window support
+  r1, 31Mar04, mf, put in it's own file for use with XC
+
+[Description]
+
+
+[Invocation]
+
+  xScrollTop(ele)
+
+[Parameters]
+
+  ele - id string or object reference. If undefined return document scrollTop.
+
+[Return]
+
+  Return the number of pixels the element (or window) has scrolled vertically.
+
+[Dependencies]
+
+  xGetElementById, xDef, xNum
+
+[Demos]
+
+
+[Notes]
+
+
+------------------------------------------------------------------------------
+xHeight, Copyright (C) 2001,2002,2003,2004,2005 Michael Foster (Cross-Browser.com)
+
+[Revisions]
+
+  r3, 12Mar05, mf, Changed xSetCH to use xGetComputedStyle and removed xGetCS.
+                   Made xSetCH inline. Reduces width/height funtions about 200 bytes.
+  r2, 14May04, mf, xHeight now accepts zero as valid
+  r1, 31Mar04, mf, put in it's own file for use with XC
+
+[Description]
+
+  Return and optionally set the element's height.
+
+[Invocation]
+
+  xHeight(ele[, uH])
+
+[Parameters]
+
+  ele - id string or object reference
+  uH - unsigned integer height; it is rounded to an integer
+
+[Return]
+
+
+[Dependencies]
+
+  xgetelementbyid, xnum, xdef, xstr, xgetcomputedstyle
+
+[Demos]
+
+
+[Notes]
+
+
+------------------------------------------------------------------------------
+xClientWidth, Copyright (C) 2001,2002,2003,2004,2005 Michael Foster (Cross-Browser.com)
+
+[Revisions]
+
+  r2, 27Jan05, mf, Moz update for xClientWidth/xClientHeight, check for 'CSS1Compat' (experimental?).
+  r1, 31Mar04, mf, put in it's own file for use with XC
+
+[Description]
+
+
+[Invocation]
+
+  xClientWidth()
+
+[Parameters]
+
+  None
+
+[Return]
+
+
+[Dependencies]
+
+  xOp5or6, xDef
+
+[Demos]
+
+
+[Notes]
+
+
+------------------------------------------------------------------------------
+xClientHeight, Copyright (C) 2001,2002,2003,2004,2005 Michael Foster (Cross-Browser.com)
+
+[Revisions]
+
+  r2, 27Jan05, mf, Moz update for xClientWidth/xClientHeight, check for 'CSS1Compat' (experimental?).
+  r1, 31Mar04, mf, put in it's own file for use with XC
+
+[Description]
+
+
+[Invocation]
+
+  xClientHeight()
+
+[Parameters]
+
+  None
+
+[Return]
+
+
+[Dependencies]
+
+  xOp5or6, xDef
+
+[Demos]
+
+
+[Notes]
+
+
+------------------------------------------------------------------------------
+xAddEventListener, Copyright (C) 2001,2002,2003,2004,2005 Michael Foster (Cross-Browser.com)
+
+[Revisions]
+
+  r2, 14Mar05, mf, reduced 136 bytes with shorter parameter names.
+  r1, 31Mar04, mf, put in it's own file for use with XC
+
+[Description]
+
+  Register an event listener on the element. For some browsers
+  the window.onscroll and window.onresize events are simulated.
+
+[Invocation]
+
+  xAddEventListener(ele, sEventType, fnEventListener[, bCapture])
+
+[Parameters]
+
+  ele - id string or object reference
+  sEventType - string event type ('mousemove', 'click', 'resize', etc.)
+  fnEventListener - reference to the listener function
+  bCapture - boolean capture event flag
+
+[Return]
+
+  void
+
+[Dependencies]
+
+  xGetElementById, xIE4Up, xOp7,
+  xClientWidth, xClientHeight, xScrollLeft, xScrollTop
+
+[Demos]
+
+
+[Notes]
+
+  13Mar05, mf, The 2 sim events add a lot of weight - find a solution!!!
+
+------------------------------------------------------------------------------
+xGetComputedStyle, Copyright (C) 2001,2002,2003,2004,2005 Michael Foster (Cross-Browser.com)
+
+[Revisions]
+
+r5, 14Mar05, mf, reduced by about 20 bytes
+r4, 12Mar05, mf, return null on error
+r3, ?, mf, added some error checking
+r2, 23Aug04, mf, option to parseInt or return string
+r1, 31Mar04, mf, put in it's own file for use with XC
+
+[Description]
+
+  For sProp use the css property name, not the object property name.
+  For finding width this works in Moz and Op, but in IE this only works
+  if padding and border use pixel units in the CSS.
+
+[Invocation]
+
+  xGetComputedStyle(oEle, sProp[, bInt])
+
+[Parameters]
+
+  oEle - element object
+  sProp - css property name
+  bInt - if true, return value is an integer
+
+[Return]
+
+
+[Dependencies]
+
+
+[Demos]
+
+
+[Notes]
+
+
+------------------------------------------------------------------------------
+xShow, Copyright (C) 2001,2002,2003,2004,2005 Michael Foster (Cross-Browser.com)
+
+[Revisions]
+
+  r3, 27Jan05, mf, Bug-fixes for xShow/xHide (Dave/dlowther).
+  r2, ?, mf, changed to use xVisibility
+  r1, 31Mar04, mf, put in it's own file for use with XC
+
+[Description]
+
+  Set the element's visibility to 'visible' ('show' for NN4).
+
+[Invocation]
+
+  xShow(ele)
+
+[Parameters]
+
+  ele - id string or object reference
+
+[Return]
+
+
+[Dependencies]
+
+  xVisibility
+
+[Demos]
+
+
+[Notes]
+
+
+------------------------------------------------------------------------------
+xDef, Copyright (C) 2001,2002,2003,2004,2005 Michael Foster (Cross-Browser.com)
+
+[Revisions]
+
+  r1, 31Mar04, mf, put in it's own file for use with XC
+
+[Description]
+
+
+[Invocation]
+
+  xDef(ref[, ...])
+
+[Parameters]
+
+  Can take any number and any type of arguments.
+
+[Return]
+
+  Return true if all arguments are defined.
+
+[Dependencies]
+
+
+[Demos]
+
+
+[Notes]
+
+
+------------------------------------------------------------------------------
+xNum, Copyright (C) 2001,2002,2003,2004,2005 Michael Foster (Cross-Browser.com)
+
+[Revisions]
+
+  r2, 2Apr05, mf, also return false if isNaN, suggested by pgira at SPF
+  r1, 31Mar04, mf, put in it's own file for use with XC
+
+[Description]
+
+
+[Invocation]
+
+  xNum(ref, etc)
+
+[Parameters]
+
+
+[Return]
+
+  Return true if all arguments are of type 'number', else false.
+  Also returns false if isNaN.
+
+[Dependencies]
+
+  None
+
+[Demos]
+
+
+[Notes]
+
+
+------------------------------------------------------------------------------
+xVisibility, Copyright (C) 2001,2002,2003,2004,2005 Michael Foster (Cross-Browser.com)
+
+[Revisions]
+
+  r1
+
+[Description]
+
+  Return and optionally set the element's visibility.
+
+[Invocation]
+
+  xVisibility(ele, bShow)
+
+[Parameters]
+
+  ele - id string or object reference
+  bShow - true = show, false = hide
+
+[Return]
+
+
+[Dependencies]
+
+  xGetElementById, xDef
+
+[Demos]
+
+
+[Notes]
+
diff --git a/SOGo/UI/WebServerResources/mailer-compose.css b/SOGo/UI/WebServerResources/mailer-compose.css
index cd49cd41..8163d9ed 100644
--- a/SOGo/UI/WebServerResources/mailer-compose.css
+++ b/SOGo/UI/WebServerResources/mailer-compose.css
@@ -1,8 +1,14 @@
 /* CSS for compose panel */
 
-div#compose_panel div {
+div#compose_panel div table {
   padding: 2px;
 }
+table#compose_table {
+  border-bottom-color: #808080;
+  border-bottom-width: 1;
+  border-bottom-style: solid;
+}
+
 td#compose_leftside {
   vertical-align:   top;
 }
@@ -24,6 +30,8 @@ div#compose_internetmarker {
   border-style:     solid;
 }
 div#compose_attachments {
+    padding-top: 4px;
+  padding-right: 10px;
 }
 div#compose_attachments_list  {
   width:            100%;
@@ -31,15 +39,16 @@ div#compose_attachments_list  {
   background-color: #FFFFFF;
   font-size:        10px;
   margin-left:      0px;
-  border-color:     #808080;
+  padding:          2px;
+  border-color:     #c3c3c3;
   border-width:     1px;
   border-style:     solid;
 }
 
 div#compose_subject { 
-  border-bottom-color: #808080;
-  border-bottom-width: 1;
-  border-bottom-style: solid;
+//  border-bottom-color: #808080;
+//  border-bottom-width: 1;
+//  border-bottom-style: solid;
 }
 div#compose_text { 
   border-top-color:    white;
diff --git a/SOGo/UI/WebServerResources/mailer.js b/SOGo/UI/WebServerResources/mailer.js
index c41f9a50..4ec09040 100644
--- a/SOGo/UI/WebServerResources/mailer.js
+++ b/SOGo/UI/WebServerResources/mailer.js
@@ -150,10 +150,6 @@ function clickedEditorDelete(sender) {
   return true;
 }
 
-/* X Library, Copyright (C) 2001,2002,2003,2004,2005 Michael Foster (Cross-Browser.com). Distributed under the terms of the GNU LGPL */
-/* layout2or3_xlib.js compiled with XC v0.22b, see layout2or3_xlib.txt for contributor copyrights, license info and documentation */
-var xVersion='4.0',xOp7,xOp5or6,xIE4Up,xIE4,xIE5,xNN4,xMoz,xMac,xUA=navigator.userAgent.toLowerCase();if (window.opera){xOp7=(xUA.indexOf('opera 7')!=-1 || xUA.indexOf('opera/7')!=-1);if (!xOp7) xOp5or6=(xUA.indexOf('opera 5')!=-1 || xUA.indexOf('opera/5')!=-1 || xUA.indexOf('opera 6')!=-1 || xUA.indexOf('opera/6')!=-1);}else if (document.all && xUA.indexOf('msie')!=-1) {xIE4Up=parseInt(navigator.appVersion)>=4;xIE4=xUA.indexOf('msie 4')!=-1;xIE5=xUA.indexOf('msie 5')!=-1;}else if (document.layers) {xNN4=true;}xMoz=xUA.indexOf('gecko')!=-1;xMac=xUA.indexOf('mac')!=-1;function xGetElementById(e){if(typeof(e)!='string') return e;if(document.getElementById) e=document.getElementById(e);else if(document.all) e=document.all[e];else e=null;return e;}function xStr(s){for(var i=0; i<arguments.length; ++i){if(typeof(arguments[i])!='string') return false;}return true;}function xScrollLeft(e, bWin){var offset=0;if (!xDef(e) || bWin) {var w = e || window;if(w.document.documentElement && w.document.documentElement.scrollLeft) offset=w.document.documentElement.scrollLeft;else if(w.document.body && xDef(w.document.body.scrollLeft)) offset=w.document.body.scrollLeft;}else {e = xGetElementById(e);if (e && xNum(e.scrollLeft)) offset = e.scrollLeft;}return offset;}function xScrollTop(e, bWin){var offset=0;if (!xDef(e) || bWin) {var w = e || window;if(w.document.documentElement && w.document.documentElement.scrollTop) offset=w.document.documentElement.scrollTop;else if(w.document.body && xDef(w.document.body.scrollTop)) offset=w.document.body.scrollTop;}else {e = xGetElementById(e);if (e && xNum(e.scrollTop)) offset = e.scrollTop;}return offset;}function xHeight(e,h){if(!(e=xGetElementById(e))) return 0;if (xNum(h)) {if (h<0) h = 0;else h=Math.round(h);}else h=-1;var css=xDef(e.style);if(css && xDef(e.offsetHeight) && xStr(e.style.height)) {if(h>=0) {var pt=0,pb=0,bt=0,bb=0;if (document.compatMode=='CSS1Compat') {var gcs = xGetComputedStyle;pt=gcs(e,'padding-top',1);if (pt != null) {pb=gcs(e,'padding-bottom',1);bt=gcs(e,'border-top-width',1);bb=gcs(e,'border-bottom-width',1);}else if(xDef(e.offsetHeight,e.style.height)){e.style.height=h+'px';pt=e.offsetHeight-h;}}h-=(pt+pb+bt+bb);if(isNaN(h)||h<0) return;else e.style.height=h+'px';}h=e.offsetHeight;}else if(css && xDef(e.style.pixelHeight)) {if(h>=0) e.style.pixelHeight=h;h=e.style.pixelHeight;}return h;}function xClientWidth(){var w=0;if(xOp5or6) w=window.innerWidth;else if(document.compatMode == 'CSS1Compat' && !window.opera && document.documentElement && document.documentElement.clientWidth)w=document.documentElement.clientWidth;else if(document.body && document.body.clientWidth)w=document.body.clientWidth;else if(xDef(window.innerWidth,window.innerHeight,document.height)) {w=window.innerWidth;if(document.height>window.innerHeight) w-=16;}return w;}function xClientHeight(){var h=0;if(xOp5or6) h=window.innerHeight;else if(document.compatMode == 'CSS1Compat' && !window.opera && document.documentElement && document.documentElement.clientHeight)h=document.documentElement.clientHeight;else if(document.body && document.body.clientHeight)h=document.body.clientHeight;else if(xDef(window.innerWidth,window.innerHeight,document.width)) {h=window.innerHeight;if(document.width>window.innerWidth) h-=16;}return h;}function xAddEventListener(e,eT,eL,cap){if(!(e=xGetElementById(e))) return;eT=eT.toLowerCase();if((!xIE4Up && !xOp7 /* && !xMoz */) && e==window) {if(eT=='resize') { window.xPCW=xClientWidth(); window.xPCH=xClientHeight(); window.xREL=eL; xResizeEvent(); return; }if(eT=='scroll') { window.xPSL=xScrollLeft(); window.xPST=xScrollTop(); window.xSEL=eL; xScrollEvent(); return; }}var eh='e.on'+eT+'=eL';if(e.addEventListener) e.addEventListener(eT,eL,cap);else if(e.attachEvent) e.attachEvent('on'+eT,eL);else eval(eh);}function xResizeEvent(){if (window.xREL) setTimeout('xResizeEvent()', 250);var cw = xClientWidth(), ch = xClientHeight();if (window.xPCW != cw || window.xPCH != ch) { window.xPCW = cw; window.xPCH = ch; if (window.xREL) window.xREL(); }}function xScrollEvent(){if (window.xSEL) setTimeout('xScrollEvent()', 250);var sl = xScrollLeft(), st = xScrollTop();if (window.xPSL != sl || window.xPST != st) { window.xPSL = sl; window.xPST = st; if (window.xSEL) window.xSEL(); }}function xGetComputedStyle(oEle, sProp, bInt){var s, p = 'undefined';var dv = document.defaultView;if(dv && dv.getComputedStyle){s = dv.getComputedStyle(oEle,'');if (s) p = s.getPropertyValue(sProp);}else if(oEle.currentStyle) {var a = sProp.split('-');sProp = a[0];for (var i=1; i<a.length; ++i) {c = a[i].charAt(0);sProp += a[i].replace(c, c.toUpperCase());}   p = oEle.currentStyle[sProp];}else return null;return bInt ? (parseInt(p) || 0) : p;}function xShow(e) {return xVisibility(e,1);}function xDef(){for(var i=0; i<arguments.length; ++i){if(typeof(arguments[i])=='undefined') return false;}return true;}function xNum(){for(var i=0; i<arguments.length; ++i){if(isNaN(arguments[i]) || typeof(arguments[i])!='number') return false;}return true;}function xVisibility(e, bShow){if(!(e=xGetElementById(e))) return null;if(e.style && xDef(e.style.visibility)) {if (xDef(bShow)) e.style.visibility = bShow ? 'visible' : 'hidden';return e.style.visibility;}return null;}
-
 function showInlineAttachmentList(sender) {
   var r, l;
   
@@ -195,7 +191,7 @@ function adjustInlineAttachmentListHeight(sender) {
   var leftHeight, rightHeaderHeight;
   leftHeight        = xHeight('compose_leftside');
   rightHeaderHeight = xHeight('compose_attachments_header');
-  xHeight('compose_attachments_list', (leftHeight - rightHeaderHeight) - 10);
+  xHeight('compose_attachments_list', (leftHeight - rightHeaderHeight) - 16);
 }
 
 function hideInlineAttachmentList(sender) {
-- 
2.39.5