From fc1c3fd568587d91c8f62c6c50beca05bed1a932 Mon Sep 17 00:00:00 2001
From: Lorenzo Tilve <ltilve@igalia.com>
Date: Wed, 13 May 2009 18:57:49 +0200
Subject: [PATCH]  ItEr08S08ListadoRecursosTraballadoresItEr07S09: Visual
 improvements on worker and error pages

Modified worker list and edition subcomponents
Modified error pages to include standard template
Updated maimenu component with workers and plannification links
---
 .../main/webapp/WEB-INF/i3-label.properties   |   1 +
 .../webapp/WEB-INF/i3-label_en_US.properties  |   1 +
 .../src/main/webapp/WEB-INF/web.xml           |   4 +
 .../src/main/webapp/common/css/navalpro.css   | 185 ++++++++++++++++++
 .../src/main/webapp/common/error.zul          |  30 +--
 .../src/main/webapp/common/img/v1/blue_ga.jpg | Bin 0 -> 6089 bytes
 .../src/main/webapp/common/img/v2/blue_ga.jpg | Bin 0 -> 21552 bytes
 .../src/main/webapp/common/img/v3/blue_ga.jpg | Bin 0 -> 5534 bytes
 .../main/webapp/common/layout/template.zul    |   4 +
 .../src/main/webapp/common/page_not_found.zul |  18 ++
 .../src/main/webapp/common/resources.zul      |   9 +-
 .../planner/css/productionmanagement.css      |   4 +
 .../src/main/webapp/planner/main.zul          |   1 +
 .../main/webapp/resources/css/resources.css   |   4 +
 .../main/webapp/resources/worker/_edition.zul |  21 +-
 .../main/webapp/resources/worker/worker.zul   |   7 +-
 16 files changed, 260 insertions(+), 29 deletions(-)
 create mode 100644 navalplanner-webapp/src/main/webapp/common/css/navalpro.css
 create mode 100644 navalplanner-webapp/src/main/webapp/common/img/v1/blue_ga.jpg
 create mode 100644 navalplanner-webapp/src/main/webapp/common/img/v2/blue_ga.jpg
 create mode 100644 navalplanner-webapp/src/main/webapp/common/img/v3/blue_ga.jpg
 create mode 100644 navalplanner-webapp/src/main/webapp/common/page_not_found.zul
 create mode 100644 navalplanner-webapp/src/main/webapp/resources/css/resources.css

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 @@
 		<location>/common/error.zul</location>
 	</error-page>
 
+	<error-page>
+	        <error-code>404</error-code>
+                <location>/common/page_not_found.zul</location>
+	</error-page>
 
 
 </web-app>
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 @@
+<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
+<?link rel="stylesheet" type="text/css" href="/common/css/navalpro.css"?>
 <zk>
-	<caption>
-		Erro ${requestScope['javax.servlet.error.status_code']}
-	</caption>
-	<vbox apply="org.navalplanner.web.error.PageForErrorOnEvent">
-		Prodúxose un erro na execución:
-		"${requestScope['javax.servlet.error.message']}". O erro
-		gardouse e procurarase arreglalo no menor tempo posible.
-		<hbox style="margin-left:auto; margin-right:auto">
-			<button id="reload" label="Reload" />
-			<button id="quitSession" label="Exit Session"></button>
-		</hbox>
-	</vbox>
+
+    <window self="@{define(content)}" >
+        <!--caption>
+            Erro ${requestScope['javax.servlet.error.status_code']}
+        </caption-->
+        <vbox apply="org.navalplanner.web.error.PageForErrorOnEvent"
+            sclass="errorbox">
+            Prodúxose un erro na execución:
+            "${requestScope['javax.servlet.error.message']}". O erro
+            gardouse e procurarase arreglalo no menor tempo posible.
+            <hbox style="margin-left:auto; margin-right:auto">
+                <button id="reload" label="Reload" />
+                <button id="quitSession" label="Exit Session"></button>
+            </hbox>
+        </vbox>
+    </window>
 </zk>
\ 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 0000000000000000000000000000000000000000..327f3c9da40edd91c193ebad8e798d82720b5ea0
GIT binary patch
literal 6089
zcmb7GcTf||w+$avX@)8_(p02KClHEASE<sg5UM~T9i)kTQl%H^RYatQ-a84>doKng
z^k6`GfQP?7-preE-n@5qW@mQy?76$MbMKz(+3O#GJI_?qRR9D81b~#A2Dn}TC<2HH
ziHL{@iElb$Vqy|f3Nq3gP?MA2q5x9U&;Y4{Kw1V?Mp`;%dLZyF$6aPNHV_Cz%gD*i
z$<EEn4r2c!LU6N{l!TOujEst%4oJuT|HgF(07wS#A>bz@-~{{wBp?J5T=xK20R(`5
z2>%@Szd=GuNJRV(*`HN~I{*SAf`4ufPegKykobo3hfPFG0wks35T;eov7+O2rGFY6
zFQRLmkcS{+;1YH7d|%bcEk4F50ak?GNU+>U{|WHl@_;|X8wt{zMRDMN^a+Vc{~;m#
z591FRNW>vbOmidd8vKidmQy4?57CLH<5H{|!-+k0yPgM75Z=&$gg}5i;6ecSH@voW
z6BE|U@#b;6?U{D2J9H1Kx@zELXJzoxxYWNhtlMePWPGpbA62WS(~*d?0OQ0d2J5Ne
z6iD*2$)oJ}r!tMCF5wr;fh9%VU~k-r047(i?RhK`T!|hFb33H1w@<Ttf&p*jIrMLq
z4ES+kvKmWf=E88k<eIUd8s~Ahx#CaXs8>7$d_YaBLGRCk8H?D5(V=7Q-*Dx}6*5h|
zKDrk{&$ovl#d#t>4yMYTB|Tic#znWg5ugO@;}GE!fi<kM+lRCg<A@Fvzovk@7J_^?
zn_+SC<hLipq^jnP4Z9=@W%hBvjBIQA8iw@OZp$@*9!*F@T02b*y9P8JvC_t5-+KYK
z1$(jt_Una5MYhs#{+}U0ajZ$9BIq<NT_=1{<Lwvwis4MZp0Pq|<`L9nKmMbr%-aMn
zPzPwp*}8kbkYcm8YU2dR7(K1QQ*N7Zv16Cr$-2KR^<-8_Ye~KuTh~zCJs8;7b0}6-
zXF`(mp|(C~HmF4F7gnaTOmE}K_L?3ls=rUe{h(Vk_9UokA0EUr)7R@yMZ4ypTA|>2
z@4KBMm7GDDTr2&-u{(WS*SdZ0I-gu^6Lvj8lDaPhL;Xh8GoNH<mrCHxA*kH-NljIo
z2?^*=7&+DRnri^n+TdM7VxK2?{Vy9wE?z7M89a}OVg?iG1<GYKM`3-X9X4qeNEl-i
z7{dn9^7dXk#B3ZxIU1inJhHk5)W6!_$CsMjM$31Gi>nlsQkKUSK2x}y`5X%>+mva}
zZY^Uo{A&DE1<ETM(>F{lcxifPHrw9soH)w(b+{`fT?tq{P@$6WYdA=Bf0K?>Lxcak
zfcb)Ei0db!c`(N>NWbIFCvnvMfF^2ldA`X?#dn=ivF$HsF0bfLp1-yPsSPCcG4^fy
z)!B>ZGVUQ3sm;T6Ur#7olWlxJ<N8K14PN(-wbdW~{M~lnp;*I^NBleLSVS@xh6?<!
z^mezf!S7@I!MG3^Pif!4>{#VlM!Ui~Vo`u1e9m@v{u+SNq95-~J{Qs0*{`r99#>NS
zTCelBZ2HTbp1&>?bKO(FyIc!fQ>Ky4t615^Bax4=z1eP#--mE~*%kAzx!xl)?8B~I
zH&qRN|EMFQCQ`LiId(%n#^d%vA}Ubcg(iDj$aily5hg;Z%$6%T$VL#KAv|pAVComY
zoz4a<lmzU*YhMtH_Z3`LugiJrH5MN~&(Haw1va|xX@)C`II0OywZ_40&gRk%>YJU!
zj{Pn#Sx&RFe)!X^{yuV%BrL(Uy*^Y6WXBILjY**b4RfZrf6G~FF2;Aexp7J<G{Mc=
z2&c+R8rtrQ4RyQM&R;+xj-Hnvn-`}Gw$hc?)1ePYn~UE-j^zB#%Tp{x?M2hd;=l)U
z8BEa#<f`}nUfZR9*tg$%W_x!1%POWH;dBLqfyGCl@A^l1?U6&%uSy2qw)|Ts>ABQh
zKPk}g!0x$k$tvMY!gTg6;aCAY_xYi@v{9o~#lIqJ<+9kC4agf)wDWOHt1QXYGv6?h
zE6cs-_ol09dCK{&YOFP5XODL3#}q|<bLxffMwB(KqI%S3A`4zEmn{TbhCk|e0jns?
z)X9nF-`QX9za>9d#)@iAa^J65hoglHQHfTTAF9HE?u^ENdCk8~F_arb`=`jgHZUEc
zE1Nx!eJa~EuN<c)!9Yeur^ltf8488BVbpgkH?srT3VwSX_?{dem<5XA<l17t?ivV;
zjbx?e@M#%LJMNxboJ-<lA#(<E+_knbyjeuCR!%k!M3wPl9qeJSOG6Z1d$g(O#d@jP
zKtvTiCa!%?0*mR_${1PlM&KpQ+n88==Oh#M>exz#U5g9Rv$c^!C$ibiZyyFM7zi$;
zEH(bj?iqQUV9eH>y|$Q8neW^>OZV_`I*oc&`7kl=)#?&S+T^i%zLzZ|R`%6z=*ae4
z(BmSf2^}lzeiYlc_4t){aEpL?wq}sFA=1R1Aa&B1WVCAy(+r8}5pL%rEy<cISgfcx
zHGkK?RR(%Vo7&I%Av}2J#0s9|@}QV-@*2Ri=7W_1AKbF`1Y_kbO)G+SrwvqIs4%5J
zCmFt!M_Dh8rD`FB_9`A)AvkdN1uog)3cuMHU4gzcts}1P^?cJP7N~=h7g>1ZZHMsx
z9l8D{tBglv*4cP_WUrTDokrnL;o6qwI0;BjM!jbLtd;*h5XqmcsiNdFmS!t9c9n!<
z_`=6w$QxY|pC@WxVkgY6D_Nbcs?3IbeX_Xf^-?8W0O~Md8*ksU*q)KNzP?bj<-PLV
z3L(2VDKS~F5uI5V2vs~N{MyJo0<qL^j5-@oOqY&JlagG>T1sEK{7#57lVjKk+R2t!
z+l3BGT=Mq3oO-+=Km?nCSMJXYd{<N8Di8_&6-{TJOlx;15eM}6;*i(C=ESqii4k+z
z^>Z9~CM@o#)UpC(S}0$jj2UKc3yie=S-`Co{tn&H&RImUn@ZD-;2MN|@JWzRL#c8x
zAA_AS4KT9b97+uVrG--`)pitqR>-xz^x8e27UXvptk**B0$g;-wQ#l2=QLF;4;3_u
z*Z#a48#QXgzmoXLr5WEkRX}BZA|z=L#b-WuijMa6iV=fc17Me*UJ7@$5+)~47)>PS
z$D`b~*GKnHg@W-6g@ROX4ocr^Rr<R@Zk4Lx&KRAGI=;qIh-VxnvnGEUb&-GHa-Mt3
z_w4M6%u?vm1s_vl3Y4cpCcnaBN-s5))1Y>&K5fR5Y^z<FyB8{a`mL<^V}VJs*KrJ4
z2+J99W7VTnS4F+05j)`qHWGY^a7vbiF|>hY68uh0V5<$4|Bcnx?Uuk+Yn<G=rJNo(
zIB(vf<Db9|K3n>ilJtjQV~#|lO_>ztk5yztb<cR9w~heR8|`0q+I#jq_P9cjKR4Ib
z`tboN-Ly)J@500yKeNSL?8=LahJf8oEhXk7&zBydXpsEwXEm_%JF3Yh8TqB{<%`cq
zE6DH9zO^a126Sz03UVqIi!%ITqR=R1hm}aJXm*mOwMq)eN@8W2*^oO_UCCvFqrt6r
zf{041!#hqwjfwVLIInVf#~*&W<GC!V+H1j^mwlx<w_g0Ta@kn(0=_GGh!56D6GzeP
zC?0=kV*-y6rVU2^^4Nn{JY?D5t5OZ)kEQ|uysC&#ji>A^IEb|Pxf3LFHGD?LOdJa4
z84az)WA54@Xqwl(xkvjX5*V*a!tlqBo-#DgZZ4Xjl?1-7+mupURq6og^v3>H<A8cC
zUS$?o1o{&4rtbCO&m~qw1B`VXN(AaOeO9ujb#;YCoi$zqJe-0;uK|7RR9EATnP!BM
z3VZMq;==9)1F&DY9U5a|-%RU^@n;Lm&eAf9I6AlnFrKDhvaSI?%fDO$9)_JMea<u*
z+nbiQn#%JIN&2=A0)ZiS*V#?a2<ukj5A<^g-MtSp%?2$86@Q(~g*!9MW5ar)#}GZS
zoW9;1a1|9L5gY1^l&m%D*c^)+r#Bb}Vemm{4GfZNd9uKhx0Zf<#yk2QF%(Y7$d#{}
zzU^!Dm&A6mUtTpsa0FI^4GwLP(Y|1`^^vTrE-XX5y86|`)yOhm#AlBwIo|C(^%A!f
zc(-zjvW)w;Av6t=swhaKQERH#8Ta5{a6hx$@k??)QHiG^a`zc#>ug{{_nNKh1GUvo
zZX^9tGZ*cfYV!F?YM0L)C-Td+R_{9<tl8oXCIVOr^*tG9zHQ^uB^`&X3Qt1_)naOc
zRqvT@ke|%veA&l$CE@&Zf((6p6Z$$ITq+^(vYIa&MbyVW2M|2?Wp=JRvl>Lw$ZllU
z{sMUoxCTJ@50B60sYkyZs{Q2O!PiAj7@8a`$+GOOr=ypR%+bi1x5w~(`WM<4$ol1L
zfLh!>!Pkq~!`o*?!i`;^9f0XIpy0`6xSX=lTQ4%OW9OFv+gy!jX$Y`<p!d=G<toeR
zLvHCud$F6Ba?0qNQZOVna!cau45f2=>X%cjOC>#YKS;a??5l&N>NjB!WH@oAcyQw`
z<+sT5Zj_mggoJE7$zTg4m-$``6IDs>;i)|FlN-$$PNN`TV{L@%l1xnKebc+k8ru>7
z45PGppEdY?<(y)cWXZ5%J?3B+0(q(Y_Q7{*!#78+0XCCC8@ktk+7i<cDzEsNrl>Fp
zZr|W4e;Bys$eoNOwu0C3ymla?Bii^&%@su3V92g`H2p<O1@wMmQe!hg`@|ca(_X~z
z?1zwk)!-@`naVTa72$lT?ur_~?N<F;-K|bvYEo)ubT$s;Np_^Xr8&^D_|A&NpfS=(
zKKQLNk8Jq8#lQ#hDtkrmF}-vd4Z)M&F5XWTn@!6oNNmj@22y3(_^mErTM$?+&WJ12
zN>oF80(wX_TIX&fGC~mCwKtEIvskV1De4J;l+=_(^A<AMizoE8#v}W7z$DJUu+Rqf
zoU=LWwGUE4W+G#HF5vGx<jHBgaPt99nT5B<5WcFyN1p29uMI;2uUM^`uN3s#$Dvn4
zH|aFIdJS+&o|U5T!1b~?<|Y<bY4{MU0(;^c4u<&3dI)lJ0h04B_6U>!hk46{&WLI|
z?5$bzg{RxZn7F%ib(G*Lai(~t+@sdVp<f0B)>Du_-mS{YS$pp-xJ>1I6~2qdaw7R2
z7^gg%b#$6VFD$+V{?s?_YN=CIbz+ebo%FI4Q}h*@wvk^}@#e_5h(2al0>6EP_RxH<
z7&GtbWOv10Tc6{WxtG=mr1-S(_!&LUgERmFnbsgfVot9CB~|r+_|w!mgIw=xfRQ{e
z*NOQBYRVL4tFg^gh^}WS-7XO?Ow_brbN0eS7p_nWEtI@FScLBndTrCK&H!t~{T<sb
zbw2tlv~(f{Sr2#b%DG(D>0^4idt*P+jE@p~-{wM2Ez0@iI>-0_U}ar}YYc^;_3~1|
zbHP^$zWkndxQag^@h=dP1xg_m5-ZwkSNUbQIlasW6@L0oyY)2X6Dftf`KK?;+@do#
zkqhl`jj#!Cwr0LJUivs%JhBGMOn@W&J!jgbdXR}eXdLG1$eHm_QqFDqn{8=mD(_8C
zwn8Wj2aItzYg6`RyzvcY?_h*q$ZbZ|)Ksh@>UXEAy*@aJ>IFrZs6(kd1h)>wvQfEv
zn+-0J&zWxHrv2-GxZM3r?YYH?5%jAM8d%I~ryAhma&obF??>CeBm7)URMmE|!pVH$
zRiL3zoU{iQj{IJnGrv?`SGcYg&yXD{CEJDJTCc8cv$ODAR%MNxK{guY(zgjICwJB|
zDfFsZ#8o{L&*CpnYN*cE$hnVQfg<+TPX(hl(>_)k=^(%!s|ws&StA&SXjIQx#O!;P
zN$(Z75*3$qB}RP8%2W96U?68|(Z>RdWV-|<ZI!znTJDvmx`-+v#2ytibeI&u9{Kp`
zCFUa!q*`|3#j$K+aAoDlt)7s2%~xKFzQ5&~J)EawmSGe22s;U7lLta5D_m&8mZU5h
zyJCC(jfbsbW`0P?Fbx8J>^2a01)tZvdi+>;=Hrc}w`%Ji$+d8>as^+cz($cTOYG(_
z2r=#2ilqHE>^;wI_3Z|)sx&5?Sjj|!uS<)xp$5gPPb#Q8U8<k|mHdU7^QfAMF5?oP
zN2)EJdaqLnxSKZ+H^=m_b$$1X-f7$Bynj1aY@rbr5FaHKoC-cK;$%WcS=_-X1{r3w
z4fuRb(d18-E)$IGiU01B&8CKJ9l57+fL>*b)g@S88CbH*Tb%=+r<Au$Rera(4}(Mm
z4N5^pJY3fuxzDm%BRjdVRm?1v<`I>%#cnt|ZscU3%KZaXhaQSjxJB^N@ph2-U|{H2
zg<tk1U#R=y^UO7kj0C^LF{?TXZ*FAw>+WrG`rxa%#j#IPi(`lTLv@`+F6Z#grzbGg
z@kW7XCl3O=q^p-kczyqEdNsZbow1gQxO(l9uClv!r0oHOU>xM0yE7JwO+VU!tqI-j
zH!vYL<)=?az4MFiSc0t~z=NJqqN8~xrFAQ-M*cdXY34H+SGJLtljr3sPkYMyjY?ex
zC>;g5DPo<Df0A%wwFCD>8&z&9Hn!T<I*MM!Tene+>dh-ZbK%4;D<7&PQkY6dc59QT
zkw>iept`ZMa8;uTX~Mn$Yuy8;l$eJHKIb#W6z|m*WUSD!Y?+d~0n?$+vYZ1Y29IFI
zF_s^aYNRK!R_}EA*15{61|SE99zws5yjiZ67xxzb7@gQ8Pnr2H4F4IX&W#O_ICylE
z0lYUEkjXFjYq#-?pPh>b);bs}l2sxeD@HSL$9)yDe~>uo$@1Imnc+c9t%-wOKtn+V
zhrb`?t_qKU6Kc=xooYN@WkH~s`&{C3{`m7EUNJujl$I;I*bHBQWdT3e%!<W8&3L<J
z-uB#?`|!&sQYznP-H+SB-AtBDcG8Us<d7=pZ)0LgGZ(xF3UdTpLV}1>ZHhu3o0O}(
zWcd;5$m6pp;?MybCpg2(#MTW^(d;d_&lSg=_OIe$DUE)<6c)<SazpFhGimAxvhUN?
zbo_<;6#Nv*M?VibKoy?=2r2;{<m0hW5t;?Ws!3AMppB+WciWJt7v%ii*w9s7*(2lU
z82&J%#H2i<#dCUp1GiHfv1@?c#1*??fNv6gq*)Y+Z11E~<FKG>#ODO>2f4<7vxq((
zI!y-soAWlWILf)clD4hHDJhv$Tf4e5NSg&1rofoZ@5r=zZ=EI>s5$6{I@(2k=1+j{
zvrYrdkCc=wdSCx=zV|W69(@&lNj-J$$FDEkaQ@*MK&eUQi{fiEB3YZ*+6@n{4!5R&
z5;;@G!k&<->`Jh_^)M1xb3Mk;niN?00@kS#gx2bd^pun<`>de@b1cjoVqy)H5rmcJ
zlp~my^rJzo@NTAPtf0HE$}l%p9dyIQs;&7t`Z2Gf+$CMxP<3mEd_<GH8fG&orH{iK
zS}H4D1~u_3=J+unV@|c}HGuS25V0lt1oNv!c%Z#}xou}sk5^g$2wF^dFA$Hb6Jp-G
zR88mPRDPPI&!#IKSJzyRiH&n>4!npJD~>JDsc?B6*8>{Emx3e_H`g}$(F^4}JQd?Z
z4Uf;bA*E|hKw7rj%aS0MLC<vU7Z}QPiw-aL94#9q<*dq{Iil$3;Leud&Q`?$x$sR6
z56ypjx>-&zRt|FuCyRdhoR7cnbV7XXLZwK0oG~GzC*%{W(O76UvT@K`^cI_m*MjRQ
zO?Y_AcZ*w0-0+APn=Fg*vFf(A*7uj`WOe`zT5d}2cj&f-_ww;vxSKcO)h$;4kj$rS
VUJi+8AyklmKm0$xuJ-G>{{p>cte*e?

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..62a1971b26132c23a9e485d21d6c4f2b9756a297
GIT binary patch
literal 21552
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

literal 0
HcmV?d00001

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 0000000000000000000000000000000000000000..63ced9ee85f0da4f7150ae5bc47ff686635ff5d6
GIT binary patch
literal 5534
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
PD)=v5gZ~FAbu;xJ0d8O0

literal 0
HcmV?d00001

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 @@
 
             <menu label="${c:l('mainmenu.resources')}">
                 <menupopup>
+                    <menuitem label="${c:l('mainmenu.list_workers')}"
+                        href='/resources/worker/worker.zul' />
                     <menuitem label="${c:l('mainmenu.add_resources')}"
                         href='/common/resources.zul' />
                     <menuitem label="${c:l('mainmenu.manage_resources')}"
@@ -34,6 +36,8 @@
 
             <menu label="${c:l('mainmenu.plannification')}">
     			<menupopup>
+                    <menuitem label="${c:l('mainmenu.plannification')}"
+                        href='/planner/main.zul' />
     				<menuitem label="${c:l('mainmenu.add_task')}"
                         onClick="alert(self.label)" />
     				<menuitem label="${c:l('mainmenu.manage_tasks')}"
diff --git a/navalplanner-webapp/src/main/webapp/common/page_not_found.zul b/navalplanner-webapp/src/main/webapp/common/page_not_found.zul
new file mode 100644
index 000000000..25edcf356
--- /dev/null
+++ b/navalplanner-webapp/src/main/webapp/common/page_not_found.zul
@@ -0,0 +1,18 @@
+<?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
+<?link rel="stylesheet" type="text/css" href="/common/css/navalpro.css"?>
+<zk>
+    <window self="@{define(content)}" >
+
+        <vbox apply="org.navalplanner.web.error.PageForErrorOnEvent"
+            sclass="errorbox">
+            <vbox>A páxina que está solicitando non existe.</vbox>
+            <vbox>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</vbox>
+            <vbox>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.</vbox>
+            <vbox>Desculpe as molestias.</vbox>
+        </vbox>
+    </window>
+</zk>
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 @@
-<?init class="org.zk.myhello.pages.MyHelloPageListener"?>
+<!-- ?init class="org.zk.myhello.pages.MyHelloPageListener"?>
 <?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c"?>
-<?link rel="stylesheet" type="text/css" href="/planner/css/productionmanagement.css"?>
-<?page  id="myhello"?>
+<?link rel="stylesheet" type="text/css" href="/common/css/navalpro.css"?>
+<?page  id="myhello"? -->
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
+<?link rel="stylesheet" type="text/css" href="/common/css/navalpro.css"?>
 <zk>
 
     <grid fixedLayout="true"  self="@{define(content)}">
 	<rows>
 		<row>
-			<label value="Resouce" width="150px" />
+			<label value="Resource" width="150px" />
 			<textbox value="Name" width="150px" />
 		</row>
     </rows>
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 @@
 <?link rel="stylesheet" type="text/css" href="/planner/css/productionmanagement.css"?>
 <?page  id="myhello"?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
+<?link rel="stylesheet" type="text/css" href="/common/css/navalpro.css"?>
 <zk>
 
     <planner self="@{define(content)}">
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 @@
 <window id="${arg.top_id}" title="${arg.title}">
-    <grid fixedLayout="true">
+    <grid fixedLayout="false">
         <columns>
-            <column label="Type" width="150px" />
+            <column label="Type" />
             <column label="Content" />
         </columns>
         <rows>
             <row>
-                <label value="first_name" width="150px" />
-                <textbox value="@{controller.worker.firstName}"
-                    width="150px" />
+                <label value="first_name" />
+                <textbox value="@{controller.worker.firstName}" />
             </row>
             <row>
-                <label value="last_name" width="150px" />
+                <label value="last_name" />
                 <textbox value="@{controller.worker.surname}"
-                    width="150px" />
+                    />
             </row>
             <row>
-                <label value="nif" width="150px" />
-                <textbox value="@{controller.worker.nif}" width="150px" />
+                <label value="nif"  />
+                <textbox value="@{controller.worker.nif}"  />
             </row>
             <row>
-                <label value="daily_hours" width="150px" />
+                <label value="daily_hours" />
                 <textbox value="@{controller.worker.dailyHours}"
-                    width="150px" />
+                    />
             </row>
         </rows>
     </grid>
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 @@
 <?taglib uri="http://www.zkoss.org/dsp/web/core" prefix="c"?>
 <?page  id="Create"?>
 <?init class="org.zkoss.zk.ui.util.Composition" arg0="/common/layout/template.zul"?>
+<?link rel="stylesheet" type="text/css" href="/common/css/navalpro.css"?>
+<?link rel="stylesheet" type="text/css" href="/resources/css/resources.css"?>
 <?variable-resolver class="org.zkoss.zkplus.spring.DelegatingVariableResolver"?>
 <?component name="list" inline="true" macroURI="_list.zul"?>
 <?component name="edition" inline="true" macroURI="_edition.zul"?>
 <zk>
-    <window title="Worker" self="@{define(content)}"
-        apply="org.navalplanner.web.resources.WorkerCRUDController">
+    <window self="@{define(content)}"
+        apply="org.navalplanner.web.resources.WorkerCRUDController"
+        sclass="workerwindow">
         <list top_id="listWindow" />
         <edition top_id="createWindow" title="Create"
             save_button_label="Save" cancel_button_label="Cancel" />