From 29938c2169f6777e92fdebdd96062a9480f52231 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lorenzo=20Tilve=20=C3=81lvaro?= <ltilve@igalia.com>
Date: Thu, 5 Jul 2012 19:08:56 +0200
Subject: [PATCH] Fixed width problems on monthly timesheet on low resolutions

FEA: ItEr76S28UserDashboard
---
 .../dashboard/MonthlyTimesheetController.java |  2 +-
 .../webapp/myaccount/monthlyTimesheet.zul     | 39 +++++++++----------
 2 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java b/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java
index 6e663cc06..0e9bf8a4b 100644
--- a/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java
+++ b/libreplan-webapp/src/main/java/org/libreplan/web/users/dashboard/MonthlyTimesheetController.java
@@ -72,7 +72,7 @@ import org.zkoss.zul.api.Grid;
 public class MonthlyTimesheetController extends GenericForwardComposer
         implements IMonthlyTimesheetController {
 
-    private final static String EFFORT_DURATION_TEXTBOX_WIDTH = "34px";
+    private final static String EFFORT_DURATION_TEXTBOX_WIDTH = "30px";
     private final static String TOTAL_DURATION_TEXTBOX_WIDTH = "50px";
 
     private final static String WORK_REPORTS_URL = "/workreports/workReport.zul";
diff --git a/libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul b/libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul
index ca60947c9..dadf53661 100644
--- a/libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul
+++ b/libreplan-webapp/src/main/webapp/myaccount/monthlyTimesheet.zul
@@ -110,27 +110,24 @@
         </hbox>
 
         <hbox  width="100%">
-
-        <groupbox width="100%" closable="false" hflex="1" style="margin-top:5px">
-            <!--  caption label="${i18n:_('Time tracking')}"  hflex="1" width="100%"  -->
-            <hbox align="center" hflex="1" width="100%" style="padding-bottom:5px">
-                <bandboxSearch
-                    id="orderElementBandboxSearch"
-                    finder="OrderElementBandboxFinder"
-                    widthBandbox="400px"
-                    widthListbox="700px" />
-                <button onClick="controller.addOrderElement();"
-                    label="${i18n:_('Add task')}" />
-            </hbox>
-            <hbox width="100%">
-            <grid id="timesheet" width="100%" sizedByContent="true" hflex="1" sclass="timesheet"
-                model="@{controller.rows}"
-                rowRenderer="@{controller.rowRenderer}"/>
-            </hbox>
-
-        </groupbox>
-
-    </hbox>
+            <groupbox width="100%" closable="false" hflex="1" style="margin-top:5px">
+                <caption label="${i18n:_('Time tracking')}" />
+                <hbox align="center" hflex="1" width="100%" style="padding-bottom:5px">
+                    <bandboxSearch
+                        id="orderElementBandboxSearch"
+                        finder="OrderElementBandboxFinder"
+                        widthBandbox="400px"
+                        widthListbox="700px" />
+                    <button onClick="controller.addOrderElement();"
+                        label="${i18n:_('Add task')}" />
+                </hbox>
+                <hbox width="100%">
+                    <grid id="timesheet" sizedByContent="true" hflex="1" sclass="timesheet"
+                        model="@{controller.rows}"
+                        rowRenderer="@{controller.rowRenderer}"/>
+                </hbox>
+            </groupbox>
+        </hbox>
 
         <button onClick="controller.save();"
             label="${i18n:_('Save')}"