From 6257815fe1a48f56a643774e18c5c28e699622ff Mon Sep 17 00:00:00 2001
From: helge <helge@d1b88da0-ebda-0310-925b-ed51d893ca5b>
Date: Mon, 14 Feb 2005 15:25:00 +0000
Subject: [PATCH] improved some UI styling

git-svn-id: http://svn.opengroupware.org/SOGo/trunk@557 d1b88da0-ebda-0310-925b-ed51d893ca5b
---
 SOGo/UI/Mailer/ChangeLog              |  8 ++++++
 SOGo/UI/Mailer/UIxMailFilterPanel.wox | 38 ++++++++++++++++-----------
 SOGo/UI/Mailer/UIxMailTree.wox        |  2 +-
 SOGo/UI/Mailer/Version                |  2 +-
 SOGo/UI/Mailer/mailer.css             | 16 +++++++++++
 5 files changed, 49 insertions(+), 17 deletions(-)

diff --git a/SOGo/UI/Mailer/ChangeLog b/SOGo/UI/Mailer/ChangeLog
index c995e1b7..b4071acd 100644
--- a/SOGo/UI/Mailer/ChangeLog
+++ b/SOGo/UI/Mailer/ChangeLog
@@ -1,5 +1,13 @@
 2005-02-14  Helge Hess  <helge.hess@opengroupware.org>
 	
+	* v0.9.106
+	
+	* UIxMailFilterPanel.wox: improved CSS styling of the search field
+
+	* UIxMailTree.wox: fixed display of special mail icons if a folder
+	  has subfolders and is open (in short: the 'cornerIcon' binding is
+	  properly set)
+
 	* v0.9.105
 	
 	* UIxMailTree.m: fixed handling of root nodes (properly display all
diff --git a/SOGo/UI/Mailer/UIxMailFilterPanel.wox b/SOGo/UI/Mailer/UIxMailFilterPanel.wox
index f87d879b..f2a52f43 100644
--- a/SOGo/UI/Mailer/UIxMailFilterPanel.wox
+++ b/SOGo/UI/Mailer/UIxMailFilterPanel.wox
@@ -1,23 +1,31 @@
 <?xml version='1.0' standalone='yes'?>
-<div
+<table
   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"
-  class="titlediv" style="white-space: nowrap;"
+  class="titletable"
+  cellspacing="0" cellpadding="0"
 >
-  <var:string label:value="View" />:
-  <var:popup list="filters" 
-             item="filter" string="filterLabel" value="filter"
-             selection="selectedFilter"
-             const:name="filterpopup" 
-             const:onchange="document.pageform.submit()" />
-
-  <var:string label:value="Subject or Sender contains" />:
-  <input name="searchtext" type="text" var:value="searchText" />
-<!--
-  <input type="button" onclick="clearSearch(this)" label:value="Clear" />
--->
-</div>
+  <tr>
+    <td class="titlecell">
+      <var:string label:value="View" />:
+    </td>
+    <td class="titlecell">
+      <var:popup list="filters" 
+              item="filter" string="filterLabel" value="filter"
+              selection="selectedFilter"
+              const:name="filterpopup" 
+              const:onchange="document.pageform.submit()" />
+    </td>
+    <td class="titlecell" style="padding-left: 4px;">
+      <var:string label:value="Subject or Sender contains" />:
+    </td>
+    <td class="titlecell" style="width: 80%; padding-right: 1px;">
+      <input name="searchtext" type="text" var:value="searchText" 
+             style="width: 100%;" />
+    </td>
+  </tr>
+</table>
diff --git a/SOGo/UI/Mailer/UIxMailTree.wox b/SOGo/UI/Mailer/UIxMailTree.wox
index f6624f71..f88e16ff 100644
--- a/SOGo/UI/Mailer/UIxMailTree.wox
+++ b/SOGo/UI/Mailer/UIxMailTree.wox
@@ -22,7 +22,7 @@
     const:spaceIcon       = "tbtv_space_17x17.gif"
   >
     <var:tree-data const:isTreeElement="YES" const:treeLink=""
-                   var:icon="item.iconName">
+                   var:icon="item.iconName" var:cornerIcon="item.iconName">
       <a var:href="item.link">
         <span class="treecell">
           <var:if condition="item.isActiveNode">
diff --git a/SOGo/UI/Mailer/Version b/SOGo/UI/Mailer/Version
index 8991b9b6..177d1750 100644
--- a/SOGo/UI/Mailer/Version
+++ b/SOGo/UI/Mailer/Version
@@ -1,6 +1,6 @@
 # version file
 
-SUBMINOR_VERSION:=105
+SUBMINOR_VERSION:=106
 
 # v0.9.100 requires libNGMime        v4.5.213
 # v0.9.99  requires libNGMime        v4.5.212
diff --git a/SOGo/UI/Mailer/mailer.css b/SOGo/UI/Mailer/mailer.css
index 74c06af5..e9587b5f 100644
--- a/SOGo/UI/Mailer/mailer.css
+++ b/SOGo/UI/Mailer/mailer.css
@@ -1,3 +1,5 @@
+/* TODO: is the section below used in the mailer? */
+
 .aptview_title {
   font-size:        10pt;
   font-family:      Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif;
@@ -79,6 +81,20 @@
   padding-top:    6px;
   padding-left:   6px;
 }
+table.titletable {
+  height:         24px;
+  vertical-align: middle;
+  padding-top:    6px;
+  padding-left:   6px;
+}
+td.titlecell {
+  height:         22px;
+  vertical-align: middle;
+  padding-bottom: 2px;
+  white-space:    nowrap;
+  font-family:    Arial, Helvetica, Verdana, Geneva, Tahoma, sans-serif;
+  font-size:      10pt;
+}
 
 .whitesec_title {
   background-color: #D4D0C8;
-- 
2.39.5