From fde4d0c1167edf510af5d61c66b28682bd6b67e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenzo=20Tilve=20=C3=81lvaro?= <ltilve@igalia.com>
Date: Tue, 29 Mar 2011 16:52:45 +0200
Subject: [PATCH] [Bug #948] Updated legend colours

An extra item was added in resourcesLoad legend to define load 100% stretch.

FEA: ItEr73S04BugFixing
---
 .../main/webapp/common/css/navalplan_zk.css   | 63 +++++++++++--------
 .../planner/_legendLoadChartCompany.zul       | 13 ++--
 .../webapp/planner/_legendLoadChartOrder.zul  |  6 +-
 3 files changed, 48 insertions(+), 34 deletions(-)

diff --git a/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css b/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css
index 1c3475d3b..0b46a4e8e 100644
--- a/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css
+++ b/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css
@@ -697,62 +697,71 @@ div.z-grid {
 }
 
 /* Legend colors:
-    COLOR_ASSIGNED_LOAD_GLOBAL = "#98D471"; // green
-    COLOR_CAPABILITY_LINE = "#000000"; // black
-    COLOR_OVERLOAD_GLOBAL = "#FDBE13"; // orange
 
-    COLOR_ASSIGNED_LOAD_GLOBAL = "#98D471"; // green
     COLOR_CAPABILITY_LINE = "#000000"; // black
-    COLOR_OVERLOAD_GLOBAL = "#FDBE13"; // orange
 
-    COLOR_ASSIGNED_LOAD_SPECIFIC = "#aa80d5"; // magenta
-    COLOR_OVERLOAD_SPECIFIC = "#FF5A11"; // red
+    COLOR_OVERLOAD = "#FF5A11";            // Red
+    COLOR_OVERLOAD_OTHER = "#FFD4C2";      // Soft red
+
+    COLOR_ASSIGNED_LOAD = "#98D471";       // Green
+    COLOR_ASSIGNED_OTHER = "#E0F3D3";      // Soft green
+
 */
 
 .legend .capability {
-    border-top:solid 2px #000000; /* COLOR_CAPABILITY_LINE */
+    border-top:solid 2px #000000;
     height:7px;
     width:25px;
     margin-right:5px;
 }
 
-.legend .load {
-    background-color: #98D471; /* COLOR_ASSIGNED_LOAD_GLOBAL */
-    height: 10px;
-    width: 25px;
-    margin-bottom: 2px;
-    margin-right: 5px;
-}
-
 .legend .overload {
-    background-color: #FDBE13; /* COLOR_OVERLOAD_GLOBAL */
-    height:10px;
-    width:25px;
-    margin-right:5px;
-}
-
-.legend .overload-order {
-    background-color: #FF5A11; /* COLOR_OVERLOAD_SPECIFIC */
+    background-color: #FF5A11;
     height:10px;
     width:25px;
     margin-right:5px;
 }
 
 .legend .overload-other {
-    background-color: #FDBE13; /* COLOR_OVERLOAD_GLOBAL */
+    background-color: #FFD4C2;
     height:10px;
     width:25px;
     margin-right:5px;
 }
 
-.legend .other {
-    background-color: #AA80d5; /* COLOR_ASSIGNED_LOAD_SPECIFIC */
+.legend .load {
+    background-color: #98D471;
+    height: 10px;
+    width: 25px;
+    margin-bottom: 2px;
+    margin-right: 5px;
+}
+
+.legend .load-other {
+    background-color: #E0F3D3;
     height:10px;
     width:25px;
     margin-bottom:2px;
     margin-right:5px;
 }
 
+.legend .full-load {
+    background-color: #FDBE13;
+    height:10px;
+    width:25px;
+    margin-bottom:2px;
+    margin-right:5px;
+}
+
+
+.resources-full-load {
+    display: none;
+}
+
+.resourcesloadlayout .resources-full-load {
+    display: block;
+}
+
 .legend .resourceload {
     height:10px;
     width:25px;
diff --git a/navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul b/navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul
index 38cc3ada1..a24a2b5ef 100644
--- a/navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul
+++ b/navalplanner-webapp/src/main/webapp/planner/_legendLoadChartCompany.zul
@@ -25,13 +25,18 @@
 <vbox sclass="legend">
 
     <hbox pack="center" sclass="legend-row">
-        <n:div class="capability"/>
-        <n:label>${i18n:_('Total capability')}</n:label>
+        <n:div class="overload"/>
+        <n:label>${i18n:_('Overload')}</n:label>
+    </hbox>
+
+    <hbox pack="center" sclass="legend-row resources-full-load">
+        <n:div class="full-load"/>
+        <n:label>${i18n:_('Load 100%')}</n:label>
     </hbox>
 
     <hbox pack="center" sclass="legend-row">
-        <n:div class="overload"/>
-        <n:label>${i18n:_('Overload')}</n:label>
+        <n:div class="capability"/>
+        <n:label>${i18n:_('Total capability')}</n:label>
     </hbox>
 
     <hbox pack="center" sclass="legend-row">
diff --git a/navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul b/navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul
index cb84c170c..1c5e58d87 100644
--- a/navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul
+++ b/navalplanner-webapp/src/main/webapp/planner/_legendLoadChartOrder.zul
@@ -30,7 +30,7 @@
     </hbox>
 
     <hbox pack="center" sclass="legend-row" tooltiptext="${i18n:_('Overload due to current project')}">
-        <n:div class="overload-order"/>
+        <n:div class="overload"/>
         <n:label>${i18n:_('Overload')}</n:label>
     </hbox>
 
@@ -40,12 +40,12 @@
     </hbox>
 
     <hbox pack="center" sclass="legend-row" tooltiptext="${i18n:_('Load due to other assignments')}">
-        <n:div class="load"/>
+        <n:div class="load-other"/>
         <n:label>${i18n:_('External load')}</n:label>
     </hbox>
 
     <hbox pack="center" sclass="legend-row" tooltiptext="${i18n:_('Load due to current project')}">
-        <n:div class="other" />
+        <n:div class="load" />
         <n:label>${i18n:_('Load')}</n:label>
     </hbox>