ItEr38S11RFMaquetacionDesenhoAplicacionItEr37S16: Added perspective customized buttons

navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css

@@ -199,7 +199,6 @@ button.z-button {
     padding: 2px 1px 1px 2px;
 }
 
-
 .sub_menu .z-button-cm {
     background-color: transparent !important;
     border: 0px;
@@ -221,13 +220,6 @@ button.z-button {
     background-image: none;
 }
 
-/*
-.plannerlayout .z-button-tl, .plannerlayout .z-button-tm, .plannerlayout .z-button-tr,
-.plannerlayout .z-button-cl, .plannerlayout .z-button-cr,
-.plannerlayout .z-button-bl, .plannerlayout .z-button-bm, .plannerlayout .z-button-br {
-    display: visible;
-}*/
-
 /* Global action button styles
 --------------------------------------------------- */
 .global-action.z-button {
@@ -885,34 +877,58 @@ span.z-dottree-line {
     border: 0px;
 }
 
+/* ---- Perspectives ------ */
 .perspective, .perspective-active {
-    width:84px;
-    height:84px;
+    width: 84px;
+    height: 84px;
     margin: 0 0 4px 4px;
-    font-weight:normal;
+    font-weight: normal;
+    font-size: 10px;
+}
+
+.perspective .z-button-cm,
+.perspective-active .z-button-cm {
+    padding-top: 60px;
+    background-position: 18px 10px;
+    background-repeat: no-repeat;
+    -moz-border-radius: 2px;
+    -webkit-border-radius: 2px;
+}
+
+.perspective .z-button-cm {
+    border: 1px solid #FFFFFF;
+    background-color: #FFFFFF;
+}
+
+.perspective-active .z-button-cm,
+.perspective-active .z-button-cm:hover,
+.perspective-active .z-button-cm:active,
+.perspective .z-button-cm:hover,
+.perspective .z-button-cm:active {
+    border: 1px solid #CCCCCC;
+}
+
+.perspective-active .z-button-cm,
+.perspective-active .z-button-cm:hover,
+.perspective-active .z-button-cm:active,
+.perspective .z-button-cm:active {
+    background-color: #71B0D4;
 }
 
 .perspective .z-button-cm {
-    -moz-border-radius: 10px;
-    -webkit-border-radius: 10px;
-    background-image: none;
-    background-color: #d4e1ef;
     color: #005782;
+    background-repeat: no-repeat;
 }
 
 .perspective-active .z-button-cm {
-    -moz-border-radius: 10px;
-    -webkit-border-radius: 10px;
-    background-image: none;
-    background-color: #2a83b4;
+    -moz-border-radius: 2px;
+    -webkit-border-radius: 2px;
     color: #FFFFFF;
-    border-top: 2px solid #3f5917;
-    border-left: 2px solid #3f5917;
+    border-color:#006699 #DFF5FE #DFF5FE #006699;
 }
 
 .perspective .z-button-cm:hover {
-    background-color: #399bd4;
-    color: #FFFFFF;
+    background-color: #E6F2F9;
 }
 
 .perspectives-label {
@@ -924,6 +940,38 @@ span.z-dottree-line {
     white-space:normal;
 }
 
+.perspective.company-scheduling .z-button-cm,
+.perspective-active.company-scheduling  .z-button-cm {
+    background-image: url(../img/ico_company-scheduling.png);
+}
+.perspective.company-load .z-button-cm,
+.perspective-active.company-load .z-button-cm {
+    background-image: url(../img/ico_company-load.png);
+}
+.perspective.orders .z-button-cm,
+.perspective-active.orders .z-button-cm {
+    background-image: url(../img/ico_orders.png);
+}
+.perspective.order-scheduling .z-button-cm,
+.perspective-active.order-scheduling .z-button-cm {
+    background-image: url(../img/ico_order-scheduling.png);
+}
+.perspective.order-load .z-button-cm,
+.perspective-active.order-load .z-button-cm {
+    background-image: url(../img/ico_order-load.png);
+}
+.perspective.order-data .z-button-cm,
+.perspective-active.order-data .z-button-cm {
+    background-image: url(../img/ico_order-data.png);
+}
+.perspective.advanced-allocation .z-button-cm,
+.perspective-active.advanced-allocation .z-button-cm {
+    background-image: url(../img/ico_advanced-allocation.png);
+}
+
+
+/* End perspectives */
+
 .vertical-separator {
     display:none;
 }
@@ -945,7 +993,6 @@ span.z-dottree-line {
     border-bottom:1px solid #9ECAD8;
 }
 
-
 .orderelements-tab {
     overflow-x: auto;
 }
@@ -1021,3 +1068,8 @@ tr.z-tree-row-seld, tr.z-list-item-seld,
 .advancedassignmentdetails .hours {
     min-width: 30px;
 }
+
+
+.function {
+    min-width: 90px;
+}

navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul

@@ -47,7 +47,7 @@
                     splittable="true" autoscroll="true">
 
                     <borderlayout >
-                        <north border="0" height="0px" flex="true" collapsible="true">
+                        <north border="0" height="0px" flex="true" collapsible="true" autoscroll="true">
                         <vbox pack="center" align="center">
                             <!--  tree fixedLayout="false">
                                 <treecols sizable="false">

navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css

@@ -648,6 +648,15 @@ div.z-tree {
 
 .advancedallocationlayout .leftpanelgap input {
     height:19px;
+    width: 52px;
+}
+
+.advancedallocationlayout .leftpanelgap .hours {
+    width: 60px;
+}
+
+.advancedallocationlayout .leftpanelgap .name {
+    min-width: 200px;
 }
 
 

navalplanner-webapp/src/main/webapp/resources/worker/_list.zul

@@ -28,7 +28,7 @@
             <newdatasortablecolumn label="${i18n:_('Operations')}" />
         </columns>
         <rows>
-            <row self="@{each='worker'}" value="@{worker}">
+            <row self="@{each='worker'}" value="@{worker}" onDoubleClick="controller.goToEditForm(self.value);">
                 <label value="@{worker.firstName}" />
                 <label value="@{worker.surname}" />
                 <label value="@{worker.nif}" />