From dd65be8857580c5981311690b03520c69bccb93d Mon Sep 17 00:00:00 2001
From: Lorenzo Tilve <ltilve@igalia.com>
Date: Wed, 10 Jun 2009 20:05:52 +0200
Subject: [PATCH] ItEr12S12RFDesenhoGraficoPortal: Visual fixes on modal window
 buttons and pannel dependencies

Javier Moran Rua <jmoran@igalia.com>: Removed dependency version in navalplanner-webapp/pom.xml
---
 navalplanner-webapp/pom.xml                          |  4 ++++
 .../src/main/webapp/common/css/navalpro.css          | 12 ++++++++++--
 .../src/main/webapp/common/layout/template.zul       |  2 +-
 pom.xml                                              | 10 ++++++++++
 4 files changed, 25 insertions(+), 3 deletions(-)

diff --git a/navalplanner-webapp/pom.xml b/navalplanner-webapp/pom.xml
index 6dcb12ba1..5dda8f07d 100644
--- a/navalplanner-webapp/pom.xml
+++ b/navalplanner-webapp/pom.xml
@@ -44,6 +44,10 @@
             <groupId>org.zkoss.zk</groupId>
             <artifactId>zk</artifactId>
         </dependency>
+        <dependency>
+            <groupId>org.zkoss.zk</groupId>
+            <artifactId>zkex</artifactId>
+        </dependency>
         <!-- Naval Planner ZK Components  -->
         <dependency>
             <groupId>org.navalplanner</groupId>
diff --git a/navalplanner-webapp/src/main/webapp/common/css/navalpro.css b/navalplanner-webapp/src/main/webapp/common/css/navalpro.css
index 9c5245ebf..cb9cb07bd 100644
--- a/navalplanner-webapp/src/main/webapp/common/css/navalpro.css
+++ b/navalplanner-webapp/src/main/webapp/common/css/navalpro.css
@@ -174,7 +174,7 @@ table {
     display:none;
 }
 
-.zk .z-button-cm {
+.zk .z-button-cm, .z-button-cm {
     color:#007bbe;
     background-color: #FFFFFF;
     background-image: none;
@@ -183,4 +183,12 @@ table {
 
 .zk .z-button, .zk .z-button-br, .zk .z-button-tr {
     background-image: none;
-}
\ No newline at end of file
+}
+
+.z-button-tr {
+    background-image: none !important;
+}
+
+.z-button-br {
+    background-image: none !important;
+}
diff --git a/navalplanner-webapp/src/main/webapp/common/layout/template.zul b/navalplanner-webapp/src/main/webapp/common/layout/template.zul
index 3ea34f558..2a7ebcd72 100644
--- a/navalplanner-webapp/src/main/webapp/common/layout/template.zul
+++ b/navalplanner-webapp/src/main/webapp/common/layout/template.zul
@@ -24,7 +24,7 @@
             <menu label="${c:l('mainmenu.resources')}">
                 <menupopup>
                     <menuitem label="${c:l('mainmenu.list_workers')}"
-                        href='/resources/worker/worker.zul' />
+                        href='/resources/worker/worker.zul#list' />
                         <menuitem label="${c:l('mainmenu.manage_criterions')}"
                         href='/resources/criterions/criterions.zul' />
                     <menuitem label="${c:l('mainmenu.add_resources')}"
diff --git a/pom.xml b/pom.xml
index 5d03c255a..195804a1f 100644
--- a/pom.xml
+++ b/pom.xml
@@ -258,6 +258,11 @@
                 <artifactId>zk</artifactId>
                 <version>3.6.1</version>
             </dependency>
+            <dependency>
+                <groupId>org.zkoss.zk</groupId>
+                <artifactId>zkex</artifactId>
+                <version>3.6.1</version>
+            </dependency>
             <!-- JGraphT -->
             <dependency>
                 <groupId>org.jgrapht</groupId>
@@ -270,6 +275,11 @@
                 <artifactId>navalplanner-gantt-zk</artifactId>
                 <version>1.0.0</version>
             </dependency>
+            <dependency>
+                <groupId>org.navalplanner</groupId>
+                <artifactId>navalplanner-gantt-zk</artifactId>
+                <version>1.0.0</version>
+            </dependency>
             <!-- Naval Planner Business -->
             <dependency>
                 <groupId>org.navalplanner</groupId>