From 009387887231e631ed6d65cc5ea8898fab081ecb Mon Sep 17 00:00:00 2001
From: Diego Pino Garcia <dpino@igalia.com>
Date: Tue, 19 Apr 2011 12:21:15 +0200
Subject: [PATCH] [Bug #998] Fix layout

Renamed infinetlyOverAssignable as unlimited

FEA: ItEr74S04BugFixing
---
 .../BaseCalendarEditionController.java        | 22 ++++++++++---------
 .../src/main/webapp/calendars/_edition.zul    |  4 ++--
 2 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java
index 67c8ce2cb..1c8e44148 100644
--- a/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java
+++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/calendars/BaseCalendarEditionController.java
@@ -169,7 +169,7 @@ public abstract class BaseCalendarEditionController extends
 
         EffortDurationPicker normalDuration = findOrCreateDurationPicker(normalEffortRow);
         EffortDurationPicker extraDuration = findOrCreateDurationPicker(extraEffortRow);
-        Checkbox checkbox = findOrCreateOverAssignableCheckbox(extraEffortRow);
+        Checkbox checkbox = findOrCreateUnlimitedCheckbox(extraEffortRow);
         return CapacityPicker.workWith(checkbox, normalDuration, extraDuration,
                 Capacity.create(EffortDuration.zero()));
     }
@@ -187,22 +187,24 @@ public abstract class BaseCalendarEditionController extends
                 });
     }
 
-    private Checkbox findOrCreateOverAssignableCheckbox(Component parent) {
+    private Checkbox findOrCreateUnlimitedCheckbox(Component parent) {
         return findOrCreate(parent, Checkbox.class, new ICreation<Checkbox>() {
 
             @Override
             public Checkbox createAt(Component parent) {
-                Checkbox result = createInfinitelyOverAssignableCheckbox();
+                Checkbox result = createUnlimitedCheckbox();
                 parent.appendChild(result);
                 return result;
             }
+
         });
     }
 
-    private Checkbox createInfinitelyOverAssignableCheckbox() {
-        Checkbox infinitelyOverAssignable = new Checkbox();
-        infinitelyOverAssignable.setLabel(_("Infinitely Over Assignable"));
-        return infinitelyOverAssignable;
+    private Checkbox createUnlimitedCheckbox() {
+        Checkbox unlimited = new Checkbox();
+        unlimited.setLabel(_("Unlimited"));
+        unlimited.setTooltiptext(_("Infinitely Over Assignable"));
+        return unlimited;
     }
 
     private void updateWithCapacityFrom(CalendarExceptionType exceptionType) {
@@ -345,12 +347,12 @@ public abstract class BaseCalendarEditionController extends
 
             EffortDurationPicker normalDurationPicker = new EffortDurationPicker();
             EffortDurationPicker extraDurationPicker = new EffortDurationPicker();
-            Checkbox checkbox = createInfinitelyOverAssignableCheckbox();
+            Checkbox unlimitedCheckbox = createUnlimitedCheckbox();
 
             addNormalDurationCell(item, normalDurationPicker);
-            addExtraEffortCell(item, extraDurationPicker, checkbox);
+            addExtraEffortCell(item, extraDurationPicker, unlimitedCheckbox);
 
-            CapacityPicker capacityPicker = CapacityPicker.workWith(checkbox,
+            CapacityPicker capacityPicker = CapacityPicker.workWith(unlimitedCheckbox,
                     normalDurationPicker,
                     extraDurationPicker, new Getter<Capacity>() {
 
diff --git a/navalplanner-webapp/src/main/webapp/calendars/_edition.zul b/navalplanner-webapp/src/main/webapp/calendars/_edition.zul
index 91616d878..9003bb3b3 100644
--- a/navalplanner-webapp/src/main/webapp/calendars/_edition.zul
+++ b/navalplanner-webapp/src/main/webapp/calendars/_edition.zul
@@ -180,8 +180,8 @@
                         itemRenderer="@{calendarController.editionController.hoursPerDayRenderer}">
                         <listhead>
                             <listheader label="${i18n:_('Day of week')}" width="80px"/>
-                            <listheader label="${i18n:_('Normal Effort')}" width="160px"/>
-                            <listheader label="${i18n:_('Extra Effort')}" width="200px"/>
+                            <listheader label="${i18n:_('Normal Effort')}" width="100px"/>
+                            <listheader label="${i18n:_('Extra Effort')}" width="120px"/>
                             <listheader label="${i18n:_('Inh.')}" width="30px" tooltiptext="${i18n:_('Inherited from parent calendar')}" />
                         </listhead>
                     </listbox>