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

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

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

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>

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;
+}

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']}
+    <window self="@{define(content)}" >
-	</caption>
+        <!--caption>
-	<vbox apply="org.navalplanner.web.error.PageForErrorOnEvent">
+            Erro ${requestScope['javax.servlet.error.status_code']}
-		Prodúxose un erro na execución:
+        </caption-->
-		"${requestScope['javax.servlet.error.message']}". O erro
+        <vbox apply="org.navalplanner.web.error.PageForErrorOnEvent"
-		gardouse e procurarase arreglalo no menor tempo posible.
+            sclass="errorbox">
-		<hbox style="margin-left:auto; margin-right:auto">
+            Prodúxose un erro na execución:
-			<button id="reload" label="Reload" />
+            "${requestScope['javax.servlet.error.message']}". O erro
-			<button id="quitSession" label="Exit Session"></button>
+            gardouse e procurarase arreglalo no menor tempo posible.
-		</hbox>
+            <hbox style="margin-left:auto; margin-right:auto">
-	</vbox>
+                <button id="reload" label="Reload" />
+                <button id="quitSession" label="Exit Session"></button>
+            </hbox>
+        </vbox>
+    </window>
 </zk>

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')}"

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>

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"?>
+<?link rel="stylesheet" type="text/css" href="/common/css/navalpro.css"?>
-<?page  id="myhello"?>
+<?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>

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;
 }

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)}">

navalplanner-webapp/src/main/webapp/resources/css/resources.css

@@ -0,0 +1,4 @@
+.workerwindow {
+	margin:60px;
+	/* width:800px; */
+}

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" />
+                <label value="first_name" />
-                <textbox value="@{controller.worker.firstName}"
+                <textbox value="@{controller.worker.firstName}" />
-                    width="150px" />
             </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" />
+                <label value="nif"  />
-                <textbox value="@{controller.worker.nif}" width="150px" />
+                <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>

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)}"
+    <window self="@{define(content)}"
-        apply="org.navalplanner.web.resources.WorkerCRUDController">
+        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" />