diff --git a/navalplanner-webapp/src/main/webapp/WEB-INF/i3-label.properties b/navalplanner-webapp/src/main/webapp/WEB-INF/i3-label.properties
index 87dacf70b..f51b51869 100644
--- a/navalplanner-webapp/src/main/webapp/WEB-INF/i3-label.properties
+++ b/navalplanner-webapp/src/main/webapp/WEB-INF/i3-label.properties
@@ -15,6 +15,7 @@ mainmenu.save=Gardar
mainmenu.project=Proxecto
mainmenu.exit=Saír
mainmenu.resources=Recursos
+mainmenu.list_workers=Lista traballadores
mainmenu.add_resources=Engadir recurso
mainmenu.manage_resources=Administrar recursos
mainmenu.check_plannification=Revisar conflitos de planificación
diff --git a/navalplanner-webapp/src/main/webapp/WEB-INF/i3-label_en_US.properties b/navalplanner-webapp/src/main/webapp/WEB-INF/i3-label_en_US.properties
index 281636956..d755c8d71 100644
--- a/navalplanner-webapp/src/main/webapp/WEB-INF/i3-label_en_US.properties
+++ b/navalplanner-webapp/src/main/webapp/WEB-INF/i3-label_en_US.properties
@@ -15,6 +15,7 @@ mainmenu.save=Save
mainmenu.project=Project
mainmenu.exit=Exit
mainmenu.resources=Resources
+mainmenu.list_workers=Workers list
mainmenu.add_resources=Add resource
mainmenu.manage_resources=Manage resources
mainmenu.check_plannification=Check for plannification conflicts
diff --git a/navalplanner-webapp/src/main/webapp/WEB-INF/web.xml b/navalplanner-webapp/src/main/webapp/WEB-INF/web.xml
index 2bcaec1ac..d959d43c4 100644
--- a/navalplanner-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/navalplanner-webapp/src/main/webapp/WEB-INF/web.xml
@@ -98,6 +98,10 @@
/common/error.zul
+
+ 404
+ /common/page_not_found.zul
+
diff --git a/navalplanner-webapp/src/main/webapp/common/css/navalpro.css b/navalplanner-webapp/src/main/webapp/common/css/navalpro.css
new file mode 100644
index 000000000..1b3d3f5ec
--- /dev/null
+++ b/navalplanner-webapp/src/main/webapp/common/css/navalpro.css
@@ -0,0 +1,185 @@
+/* ProductionManagement Global Styles */
+
+/*** Tasks ***/
+#listtasks {
+ position:relative;
+ width:400px; /** Constants */
+ top:100px;
+}
+
+.listdetails {
+ width:200px;
+ float:left;
+ margin-top:80px;
+}
+
+.listdetails table {
+ height:30px;
+}
+
+.listdetails td {
+ padding-left:3px;
+}
+
+.listdetails input {
+ width: 90px;
+}
+
+
+.z-datebox-inp {
+ width:100px;
+}
+
+
+/* Task box properties */
+.yui-resize {
+ border: 1px solid;
+ text-align:center;
+ vertical-align: middle;
+ font-size:0.8em;
+ z-index:10;
+ cursor: pointer;
+ cursor: hand;
+}
+
+/* Task lane properties */
+.row {
+ height: 19px;
+ border-bottom: dotted 1px #CCCCCC;
+ margin-bottom: 10px;
+ margin-top: 10px;
+ width: 1800px;
+}
+
+
+/*** Dependencies ***/
+#listdependencies {
+ position:relative;
+ width:400px;
+ float:left;
+ top:0px; /* Should be -60, recalc. redrawing deps. */
+}
+
+.dependence {
+ z-index:1;
+ position: absolute;
+}
+
+.end, .start, .mid, .arrow {
+ position:absolute;
+ padding:4px;
+ cursor: crosshair;
+}
+
+.end, .start {
+ height:1px;
+}
+
+.mid {
+ width:1px;
+}
+
+.footer {
+ clear:both;
+ margin:20px;
+}
+
+
+/* Width: ganttpanel constant,
+Height: is recalculated on number of tasks */
+#ganttpanel {
+ /* border: 1px solid; */
+ height:400px;
+ width: 900px;
+ overflow-x: scroll;
+}
+
+#ganttpanel table {
+ float:left;
+ padding:0;
+ margin:0;
+ overflow:hidden;
+}
+
+#ganttpanel table td {
+ padding:0;
+}
+
+.fake_column.timetracker_column_even {
+ background-color: #EEEEEE;
+}
+
+.timetracker_fake_row {
+ height: 80px;
+}
+
+/*
+.extra_padding {
+padding: 6px;
+} */
+
+.logo {
+ background-image: url("../img/v3/blue_ga.jpg");
+ height:50px;
+ width:300px;
+ height:100px;
+ float:left;
+ clear:both;
+ position:absolute;
+}
+
+.vision {
+}
+
+.headings {
+ /* height:90px; */
+ height:90px;
+}
+
+table {
+ margin:0px;
+ padding:0px;
+ border:0px;
+}
+
+.completion {
+ display: none;
+ width: 80%;
+ top: -16px;
+ margin-top:0px;
+ height: 20px;
+ background-color: #FFCC99;
+ z-index:5;
+ border:0px;
+}
+
+.row span {
+ position:relative;
+ z-index:5;
+ color:#BBBBBB;
+ white-space:nowrap;
+}
+
+.errorbox {
+ margin: 40px;
+ padding: 40px;
+ border: solid 1px red;
+}
+
+/* Forms */
+.z-button-tl, .z-button-tm, z-button-tr,
+.z-button-cl, .z-button-cr,
+.z-button-bl, .z-button-bm, z-button-br {
+ display:none;
+}
+
+.zk .z-button-cm {
+ color:#007bbe;
+ background-color: #FFFFFF;
+ background-image: none;
+ border: 2px solid #007bbe;
+}
+
+.zk .z-button, .zk .z-button-br, .zk .z-button-tr {
+ background-image: none;
+}
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/webapp/common/error.zul b/navalplanner-webapp/src/main/webapp/common/error.zul
index f2dec80ff..7a6feb5bf 100644
--- a/navalplanner-webapp/src/main/webapp/common/error.zul
+++ b/navalplanner-webapp/src/main/webapp/common/error.zul
@@ -1,14 +1,20 @@
+
+
-
- Erro ${requestScope['javax.servlet.error.status_code']}
-
-
- Prodúxose un erro na execución:
- "${requestScope['javax.servlet.error.message']}". O erro
- gardouse e procurarase arreglalo no menor tempo posible.
-
-
-
-
-
+
+
+
+
+ Prodúxose un erro na execución:
+ "${requestScope['javax.servlet.error.message']}". O erro
+ gardouse e procurarase arreglalo no menor tempo posible.
+
+
+
+
+
+
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/webapp/common/img/v1/blue_ga.jpg b/navalplanner-webapp/src/main/webapp/common/img/v1/blue_ga.jpg
new file mode 100644
index 000000000..327f3c9da
Binary files /dev/null and b/navalplanner-webapp/src/main/webapp/common/img/v1/blue_ga.jpg differ
diff --git a/navalplanner-webapp/src/main/webapp/common/img/v2/blue_ga.jpg b/navalplanner-webapp/src/main/webapp/common/img/v2/blue_ga.jpg
new file mode 100644
index 000000000..62a1971b2
Binary files /dev/null and b/navalplanner-webapp/src/main/webapp/common/img/v2/blue_ga.jpg differ
diff --git a/navalplanner-webapp/src/main/webapp/common/img/v3/blue_ga.jpg b/navalplanner-webapp/src/main/webapp/common/img/v3/blue_ga.jpg
new file mode 100644
index 000000000..63ced9ee8
Binary files /dev/null and b/navalplanner-webapp/src/main/webapp/common/img/v3/blue_ga.jpg differ
diff --git a/navalplanner-webapp/src/main/webapp/common/layout/template.zul b/navalplanner-webapp/src/main/webapp/common/layout/template.zul
index 53dd2de4a..666ea4ccb 100644
--- a/navalplanner-webapp/src/main/webapp/common/layout/template.zul
+++ b/navalplanner-webapp/src/main/webapp/common/layout/template.zul
@@ -23,6 +23,8 @@
+
+
+
+
+
+
+
+ A páxina que está solicitando non existe.
+ Se introduciu a dirección directamente na barra de navegación
+ do navegador revísea ou pulse na seguinte ligazón para ir á páxina
+ inicial: Ir a inicio
+ Se chegou a esta páxina dende outra páxina do portal
+ rogámoslle nolo notifique para que sexa subsanado no menor
+ intervalo de tempo posible.
+ Desculpe as molestias.
+
+
+
diff --git a/navalplanner-webapp/src/main/webapp/common/resources.zul b/navalplanner-webapp/src/main/webapp/common/resources.zul
index 426951cac..9726b009d 100644
--- a/navalplanner-webapp/src/main/webapp/common/resources.zul
+++ b/navalplanner-webapp/src/main/webapp/common/resources.zul
@@ -1,14 +1,15 @@
-
+
+
-
+
diff --git a/navalplanner-webapp/src/main/webapp/planner/css/productionmanagement.css b/navalplanner-webapp/src/main/webapp/planner/css/productionmanagement.css
index 8fe04e099..a6d623efe 100644
--- a/navalplanner-webapp/src/main/webapp/planner/css/productionmanagement.css
+++ b/navalplanner-webapp/src/main/webapp/planner/css/productionmanagement.css
@@ -158,4 +158,8 @@ table {
z-index:5;
color:#BBBBBB;
white-space:nowrap;
+}
+
+.zk #ganttpanel .z-button-cm {
+ border: 0px;
}
\ No newline at end of file
diff --git a/navalplanner-webapp/src/main/webapp/planner/main.zul b/navalplanner-webapp/src/main/webapp/planner/main.zul
index 8949d4c7e..7cf2f3c1c 100644
--- a/navalplanner-webapp/src/main/webapp/planner/main.zul
+++ b/navalplanner-webapp/src/main/webapp/planner/main.zul
@@ -3,6 +3,7 @@
+
diff --git a/navalplanner-webapp/src/main/webapp/resources/css/resources.css b/navalplanner-webapp/src/main/webapp/resources/css/resources.css
new file mode 100644
index 000000000..c2635a951
--- /dev/null
+++ b/navalplanner-webapp/src/main/webapp/resources/css/resources.css
@@ -0,0 +1,4 @@
+.workerwindow {
+ margin:60px;
+ /* width:800px; */
+}
diff --git a/navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul b/navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul
index 3b570f87a..e671ad010 100644
--- a/navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/worker/_edition.zul
@@ -1,28 +1,27 @@
-
+
-
+
-
-
+
+
-
+
+ />
-
-
+
+
-
+
+ />
diff --git a/navalplanner-webapp/src/main/webapp/resources/worker/worker.zul b/navalplanner-webapp/src/main/webapp/resources/worker/worker.zul
index 2516c2b67..1484ec2a8 100644
--- a/navalplanner-webapp/src/main/webapp/resources/worker/worker.zul
+++ b/navalplanner-webapp/src/main/webapp/resources/worker/worker.zul
@@ -2,12 +2,15 @@
+
+
-
+