From d3dd859411a5b6e0a6f0fa55cac3fb4468f9c39f Mon Sep 17 00:00:00 2001
From: Lorenzo Tilve <ltilve@igalia.com>
Date: Tue, 7 Dec 2010 20:54:04 +0100
Subject: [PATCH] Rebuilt the graphical behaviour of embed combobox for
 progress view configuration

FEA: ItEr64S04AdvancesVisualization
---
 .../web/ganttz/zul/plannerLayout.zul          |  15 +++++++------
 .../main/webapp/common/css/navalplan_zk.css   |  20 ++++++++++++++----
 .../webapp/common/img/small-combo-arrow.png   | Bin 0 -> 312 bytes
 3 files changed, 24 insertions(+), 11 deletions(-)
 create mode 100644 navalplanner-webapp/src/main/webapp/common/img/small-combo-arrow.png

diff --git a/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul b/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul
index 67a604eff..0d5f73944 100644
--- a/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul
+++ b/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul
@@ -67,13 +67,14 @@ planner = self;
             tooltiptext="${i18n:_('Flatten/Unflatten tree')}"
             sclass="planner-command" />
 
-        <button id="showAdvances" onClick="planner.showAdvances();"
-            image="/common/img/ico_progress.png"
-            tooltiptext="${i18n:_('Show/Hide Advances')}"
-            sclass="planner-command" />
-
-        <combobox id="cbProgressTypes" width="1px" visible="false"
-            sclass="progress-types" />
+        <hbox class="show-advances" align="center">
+            <button id="showAdvances" onClick="planner.showAdvances();"
+                image="/common/img/ico_progress.png"
+                style="width:46px"
+                tooltiptext="${i18n:_('Show/Hide Advances')}"
+                sclass="planner-command" />
+            <combobox id="cbProgressTypes" width="1px" visible="false" sclass="progress-types"/>
+        </hbox>
 
         <button id="showReportedHours" onClick="planner.showReportedHours();"
             image="/common/img/ico_costs.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 bb88ee882..6f039ade5 100644
--- a/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css
+++ b/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css
@@ -1477,16 +1477,28 @@ display:none;
     left: -3px;
 }
 
+.progress-types {
+    margin-left:-10px;
+}
+
 .progress-types.z-combobox .z-combobox-inp {
-    width:0;
     margin:0;
     padding:0;
     border:0;
-    border-right: solid 1px #86A4BE;
     color: transparent;
     background: transparent;
+    border: 0;
+    border-width: 0;
+    outline: none;
+    text-indent: -200px;
 }
 
-.progress-types.z-combobox-focus {
-    border:0;
+.show-advances img  {
+    position:relative;
+    left: -8px;
 }
+
+.progress-types.z-combobox .z-combobox-img {
+    background-image: url(../img/small-combo-arrow.png);
+    border: 0;
+}
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/webapp/common/img/small-combo-arrow.png b/navalplanner-webapp/src/main/webapp/common/img/small-combo-arrow.png
new file mode 100644
index 0000000000000000000000000000000000000000..717497ae07c95ceb4898fe1411a6fe03d3f38e38
GIT binary patch
literal 312
zcmeAS@N?(olHy`uVBq!ia0vp^p+GFb!3HF|jW@mkQjEnx?oJHr&dIz4a@dl*-CY>|
zgW!U_%O?XxI14-?iy0WWg+Z8+Vb&Z8pdfpRr>`sfEgp73Bf-5zf2RV4c6hothD02G
zd&Q8i$w9#3;>~1<EtlJNceGwy+)>4FWp#$m7Xy<^lIIykFFxRVr*v?|e^rx~oU}T#
z4hDvX|4FO#5B;>dZs+&Cv(U1{Bz9$bOrP}St3|nI3}@(EHD0%TZDE&|lF+$%hnKY<
z(LQ!zQ@}Gxla8d)g|{oycg;F17RJ5GZEf3E-mGYi><Z`H#MtI-mdBHC>{_6IGw+Rc
z;%u%(7W(u3&s|*qQ?zF3y^4>~+>AgsGcY_@$B;e8-Q>)IVt)|V)78&qol`;+08@^4
ABLDyZ

literal 0
HcmV?d00001