From 4228fc2c2f9b438f9ed524f5d56549629baa8e68 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:20:45 +0200
Subject: [PATCH] Revamped appearance of resources usage box

FEA: ItEr76S15OrganizingPerProjectDashboard
---
 .../webapp/dashboard/_dashboardfororder.zul   | 39 +++++++++++--------
 .../main/webapp/dashboard/css/dashboard.css   | 12 ++++++
 2 files changed, 34 insertions(+), 17 deletions(-)

diff --git a/libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul b/libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul
index 1c67b89f6..8721d584e 100644
--- a/libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul
+++ b/libreplan-webapp/src/main/webapp/dashboard/_dashboardfororder.zul
@@ -69,23 +69,28 @@
                     <hbox>
                         <n:div id="estimation-accuracy" style="height:200px; width:580px;"></n:div>
 
-                        <!-- Overtime ratio -->
-                        <grid style="margin-top: 43px;" width="200px">
-                            <columns sizable="false">
-                                <column width="100px"/>
-                                <column />
-                            </columns>
-                            <rows>
-                                <row>
-                                    <label value="${i18n:_('Overtime ratio')}:"/>
-                                    <label id="lblOvertimeRatio" />
-                                </row>
-                                <row>
-                                    <label value="${i18n:_('Availability ratio')}:"/>
-                                    <label id="lblAvailabilityRatio" />
-                                </row>
-                            </rows>
-                        </grid>
+                        <vbox>
+                        <hbox hflex="1" pack="center" vflex="1" style="margin-bottom:5px">
+                            <label class="dashboard-title" value="${i18n:_('Resources usage')}"/>
+                        </hbox>
+                        <n:div class="dashboard-box" style="height:40px; width:380px; padding: 25px;" >
+                       <!-- Overtime ratio -->
+                        <hbox hflex="1" vflex="1">
+                            <vbox hflex="1" align="pack" vflex="1">
+                                    <label class="dashboard-label" value="${i18n:_('Overtime ratio')}" />
+                                    <label class="dashboard-label dashboard-label-remarked" id="lblOvertimeRatio" />
+                                </vbox>
+                                <vbox hflex="1" align="pack" vflex="1">
+                                    <label class="dashboard-label" value="${i18n:_('Availability ratio')}" />
+                                    <label class="dashboard-label dashboard-label-remarked" id="lblAvailabilityRatio" />
+                                </vbox>
+                            </hbox>
+
+                        </n:div>
+                        <n:div style="height:20px"></n:div >
+                        <label class="dashboard-label"
+                        value="${i18n:_('Load percentage of resources participating in the project while they are assigned')}"/>
+                        </vbox>
                     </hbox>
                 </groupbox>
 
diff --git a/libreplan-webapp/src/main/webapp/dashboard/css/dashboard.css b/libreplan-webapp/src/main/webapp/dashboard/css/dashboard.css
index fe60b7c15..36dec2035 100644
--- a/libreplan-webapp/src/main/webapp/dashboard/css/dashboard.css
+++ b/libreplan-webapp/src/main/webapp/dashboard/css/dashboard.css
@@ -11,3 +11,15 @@
     font-weight: bold;
     padding: 5px;
 }
+
+.dashboard-label-remarked {
+    font-size: 1em;
+    font-weight: bold;
+    margin-bottom: 5px;
+}
+
+.dashboard-box {
+    border: solid 2px #888;
+    background: #fffdf6;
+    box-shadow: 2px 2px 5px #AAA;
+}
\ No newline at end of file