From fe60eb8e886f31ed83913d99dd31e30f202429cb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenzo=20Tilve=20=C3=81lvaro?= <ltilve@igalia.com>
Date: Wed, 16 May 2012 10:07:58 +0200
Subject: [PATCH] Updated captions and labels on project dashboard

FEA: ItEr76S15OrganizingPerProjectDashboard
---
 .../web/dashboard/DashboardController.java      | 17 +++++++++++------
 .../src/main/webapp/dashboard/_costStatus.zul   | 13 +++++++------
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java b/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java
index 2ab0ef83a..fec89400f 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/dashboard/DashboardController.java
@@ -163,8 +163,7 @@ public class DashboardController extends GenericForwardComposer {
                                     absoluteMargin + 0,
                                     relativeMargin.doubleValue() * 100));
         } else {
-            lblAbsolute
-                    .setValue(_("Project Deadline not set"));
+            lblAbsolute.setValue(_("No project deadline defined"));
         }
 
     }
@@ -228,8 +227,11 @@ public class DashboardController extends GenericForwardComposer {
         barChart.setTicks(taskCompletationData.getTicks());
         barChart.addValues(taskCompletationData.getValues());
 
-        barChart.getAxes().getXaxis()
-                .setLabel(_("Number of Days / Days Interval"));
+        barChart.getAxes()
+                .getXaxis()
+                .setLabel(
+                        _("Days Interval (Calculated as task completion end date minus estimated end date)"));
+        barChart.getAxes().getYaxis().setLabel(_("Number of tasks"));
 
         renderChart(barChart, divId);
     }
@@ -238,7 +240,8 @@ public class DashboardController extends GenericForwardComposer {
         final String divId = "estimation-accuracy";
 
         BarChart<Integer> barChart;
-        barChart = new BarChart<Integer>("Estimation Accuracy");
+        barChart = new BarChart<Integer>(
+                _("Estimation deviation on completed tasks"));
 
         barChart.setFillZero(true);
         barChart.setHighlightMouseDown(true);
@@ -253,7 +256,9 @@ public class DashboardController extends GenericForwardComposer {
         barChart.addValues(estimationAccuracyData.getValues());
 
         barChart.getAxes().getXaxis()
-                .setLabel(_("Number of Tasks / % Deviation"));
+                .setLabel(
+                        _("% Deviation interval (difference % between consumed and estimated hours)"));
+        barChart.getAxes().getYaxis().setLabel(_("Number of tasks"));
 
         renderChart(barChart, divId);
     }
diff --git a/libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul b/libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul
index 5dd11e979..0a46e193d 100644
--- a/libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul
+++ b/libreplan-webapp/src/main/webapp/dashboard/_costStatus.zul
@@ -22,12 +22,13 @@
     apply="org.libreplan.web.dashboard.CostStatusController"
     width="400px">
 
-    <hbox>
-    <vbox width="500px">
+    <hbox style="padding:20px 50px">
+    <vbox width="450px">
         <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;">
+        <vbox width="20px" />
+        <div class="dashboard-box" style="height:80px; padding: 25px;">
             <!-- Overtime ratio -->
             <hbox hflex="1" vflex="1">
                 <vbox hflex="1" align="pack" vflex="1">
@@ -55,12 +56,12 @@
 
         </div>
     </vbox>
-    <vbox width="20px" />
-    <vbox width="500px">
+    <vbox width="40px" />
+    <vbox width="450px">
         <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;">
+        <div class="dashboard-box" style="height:80px; padding: 25px;">
             <!-- Overtime ratio -->
             <hbox hflex="1" vflex="1">
                 <vbox hflex="1" align="pack" vflex="1">