From d7a59bd9f1a2f2f5414abeb9781e0c8fa6d6b6a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenzo=20Tilve=20=C3=81lvaro?= <ltilve@igalia.com>
Date: Thu, 11 Aug 2011 18:51:51 +0200
Subject: [PATCH] Improved appearance of tasks filter

FEA: ItEr75S08MigrationZK5
---
 .../main/webapp/common/css/navalplan_zk.css   |  13 +++++++
 .../main/webapp/common/img/ico_dropdown.png   | Bin 0 -> 938 bytes
 .../webapp/orders/_orderElementTreeFilter.zul |  35 ++++++++----------
 3 files changed, 29 insertions(+), 19 deletions(-)
 create mode 100644 navalplanner-webapp/src/main/webapp/common/img/ico_dropdown.png

diff --git a/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css b/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css
index 6d846fb5f..dce0e60c6 100644
--- a/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css
+++ b/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css
@@ -1065,6 +1065,12 @@ span.z-dottree-line {
     padding-right: 3px;
 }
 
+
+.toolbar-box .z-button-cm {
+    font-size:11px;
+    color: #0068B1;
+}
+
 /* =================================================== */
 
 .vertical-separator {
@@ -1718,3 +1724,10 @@ input.z-datebox-text-disd {
 select {
     font-size:12px;
 }
+
+.z-separator-ver-bar {
+    height: 22px;
+    width: 0;
+    border-right: 1px solid #9ECAD8;
+    border-left: 1px solid #d9f3ff;
+}
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/webapp/common/img/ico_dropdown.png b/navalplanner-webapp/src/main/webapp/common/img/ico_dropdown.png
new file mode 100644
index 0000000000000000000000000000000000000000..2ed14d94dc3925129191e9f719a9ff786200b2aa
GIT binary patch
literal 938
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbKJV{wqX6T`Z5GA|hzn0^KLgt(@p
zqyWYL|NjppN5N<ajGPeI5x(*l(6@{wL4Lsu4$p3+fjCLt?k)@+tg;?J4rhT!WHAE+
z-$4*&+%YlxEl`lX#M9T6{Wb?TzY5QSxC9%Zkc_8`V~E7%<b(yh2`&sJf+eOec3n8@
eXg;%X8UusaR0h@l)c4vzbqt=aelF{r5}E+-aWN(U

literal 0
HcmV?d00001

diff --git a/navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul b/navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul
index 2f174c68e..225956fc0 100644
--- a/navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul
+++ b/navalplanner-webapp/src/main/webapp/orders/_orderElementTreeFilter.zul
@@ -20,34 +20,31 @@
 -->
 
 <hbox align="center" sclass="filtering-area">
-    <label value="${i18n:_('Filter')}"
+    <space bar="true" />
+    <label value="${i18n:_('Task')}"
         tooltiptext="${i18n:_('Select required criteria set and press filter button')}"/>
-    <bandboxMultipleSearch id="bdFiltersOrderElement" widthBandbox="300px" widthListbox="400px"
-        finder="orderElementsMultipleFiltersFinder"/>
-    <label value="${i18n:_('name')}"/>
-    <textbox id="filterNameOrderElement" width="50px"
+    <textbox id="filterNameOrderElement" width="100px"
         onOK="treeController.onApplyFilter()" />
-    <button id="optionsButton" label="options" style="margin-top: -4px"
+    <label value="${i18n:_('with')}"/>
+    <bandboxMultipleSearch id="bdFiltersOrderElement" widthBandbox="260px" widthListbox="550px"
+        finder="orderElementsMultipleFiltersFinder" />
+    <button id="optionsButton" label="${i18n:_('options')}" dir="reverse"
+        image="/common/img/ico_dropdown.png" style="margin-top: -2px"
         tooltiptext="${i18n:_('Set Filter Options')}"
-	onClick='filterOptionsPopup.open(self,"after_end");' />
-    <button image="/common/img/ico_filter.png" style="margin-top: -4px"
+	   onClick='filterOptionsPopup.open(self,"after_end");' />
+    <button label="${i18n:_('Filter')}" dir="reverse"
+        image="/common/img/ico_filter.png" style="margin-top: -2px"
         tooltiptext="${i18n:_('Apply filtering to tasks satisfying required criteria')}"
         onClick="treeController.onApplyFilter()"/>
-    <popup id="filterOptionsPopup" width="220px" height="120px" >
-        <groupbox mold="3d" closable="true" width="200px" height="100px">
-            <vbox>
-                <hbox>
+    <popup id="filterOptionsPopup" sclass="filter-options-popup">
+                <hbox align="pack">
                     <label value="${i18n:_('from')}"/>
-                    <datebox id="filterStartDateOrderElement" constraint = "@{treeController.checkConstraintStartDate}"
-                        width="65px" />
+                    <datebox id="filterStartDateOrderElement" constraint = "@{treeController.checkConstraintStartDate}" />
                     <label value="${i18n:_('to')}"/>
-                    <datebox id="filterFinishDateOrderElement" constraint = "@{treeController.checkConstraintFinishDate}"
-                        width="65px" />
+                    <datebox id="filterFinishDateOrderElement" constraint = "@{treeController.checkConstraintFinishDate}" />
                 </hbox>
-                <hbox>
+                <hbox align="pack">
                     <checkbox id="labelsWithoutInheritance" checked="false" label="${i18n:_('Labels without inheritance')}"/>
                 </hbox>
-            </vbox>
-        </groupbox>
     </popup>
 </hbox>