From c79e88750ff16139d63aa20c7a4d59d8f36632df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenzo=20Tilve=20=C3=81lvaro?= <ltilve@igalia.com>
Date: Mon, 14 May 2012 11:23:21 +0200
Subject: [PATCH] Revamped appearance of cost status indicator boxes

FEA: ItEr76S15OrganizingPerProjectDashboard
---
 .../src/main/webapp/dashboard/_costStatus.zul | 103 ++++++++++++------
 1 file changed, 70 insertions(+), 33 deletions(-)

diff --git a/libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul b/libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul
index 780e00fe7..5dd11e979 100644
--- a/libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul
+++ b/libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul
@@ -18,36 +18,73 @@
 -->
 
 <!-- Cost status -->
-<grid id="${arg.id}"
-        apply="org.libreplan.web.dashboard.CostStatusController"
-        width="400px">
-    <auxhead>
-        <auxheader label="${i18n:_('Cost status')}" colspan="2"/>
-    </auxhead>
-    <columns sizable="false">
-        <column width="200px"/>
-        <column />
-    </columns>
-    <rows>
-        <row>
-            <label value="${i18n:_('CV (Cost Variance)')}:"/>
-            <label id="lblCV" />
-        </row>
-        <row>
-            <label value="${i18n:_('EAC (Estimate At Completion)')}:"/>
-            <label id="lblEAC" />
-        </row>
-        <row>
-            <label value="${i18n:_('BAC (Budget At Completion)')}:"/>
-            <label id="lblBAC" />
-        </row>
-        <row>
-            <label value="${i18n:_('VAC (Variance At Completion)')}:"/>
-            <label id="lblVAC" />
-        </row>
-        <row>
-            <label value="${i18n:_('CPI (Cost Performance Index)')}:"/>
-            <label id="lblCPI" />
-        </row>
-    </rows>
-</grid>
+<div id="${arg.id}"
+    apply="org.libreplan.web.dashboard.CostStatusController"
+    width="400px">
+
+    <hbox>
+    <vbox width="500px">
+        <hbox hflex="1" pack="center" vflex="1" style="margin-bottom:5px">
+            <label class="dashboard-title" value="${i18n:_('Current state indicators')}" />
+        </hbox>
+        <div class="dashboard-box" style="height:80px; width:450px; padding: 25px;">
+            <!-- Overtime ratio -->
+            <hbox hflex="1" vflex="1">
+                <vbox hflex="1" align="pack" vflex="1">
+                    <vbox style="margin-bottom:10px">
+                    <label class="dashboard-label"
+                        value="${i18n:_('CV (Cost Variance)')}" />
+                    <label class="dashboard-label dashboard-label-remarked" id="lblCV"/>
+                    </vbox>
+                    <label class="dashboard-label"
+                        value="${i18n:_('Hours invested')}" />
+                    <label class="dashboard-label dashboard-label-remarked" value="0" />
+                </vbox>
+                <vbox hflex="1" align="pack" vflex="1">
+                    <vbox style="margin-bottom:10px">
+                        <label class="dashboard-label"
+                            value="${i18n:_('CPI (Cost Performance Index)')}" />
+                        <label class="dashboard-label dashboard-label-remarked"
+                            id="lblCPI" />
+                    </vbox>
+                    <label class="dashboard-label"
+                        value="${i18n:_('Remaining time')}" />
+                    <label class="dashboard-label dashboard-label-remarked" value="0" />
+                </vbox>
+            </hbox>
+
+        </div>
+    </vbox>
+    <vbox width="20px" />
+    <vbox width="500px">
+        <hbox hflex="1" pack="center" vflex="1" style="margin-bottom:5px">
+            <label class="dashboard-title" value="${i18n:_('Project closing previsions')}" />
+        </hbox>
+        <div class="dashboard-box" style="height:80px; width:450px; padding: 25px;">
+            <!-- Overtime ratio -->
+            <hbox hflex="1" vflex="1">
+                <vbox hflex="1" align="pack" vflex="1">
+                    <vbox style="margin-bottom:10px">
+                        <label class="dashboard-label"
+                            value="${i18n:_('EAC (Estimate At Completion)')}" />
+                        <label class="dashboard-label dashboard-label-remarked"
+                            id="lblEAC" />
+                    </vbox>
+                    <label class="dashboard-label"
+                        value="${i18n:_('BAC (Budget At Completion)')}" />
+                    <label class="dashboard-label dashboard-label-remarked"
+                        id="lblBAC" />
+                </vbox>
+                <vbox hflex="1" align="pack" vflex="1">
+                    <label class="dashboard-label"
+                        value="${i18n:_('VAC (Variance At Completion)')}" />
+                    <label class="dashboard-label dashboard-label-remarked"
+                        id="lblVAC" />
+                </vbox>
+            </hbox>
+
+        </div>
+    </vbox>
+
+</hbox>
+</div>