diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java index 0276627fb..0b8b978a0 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AllocationRow.java @@ -318,7 +318,7 @@ public abstract class AllocationRow { private void initializeResourcesPerDayInput() { intendedResourcesPerDayInput .setConstraint(CONSTRAINT_FOR_RESOURCES_PER_DAY); - intendedResourcesPerDayInput.setWidth("80px"); + intendedResourcesPerDayInput.setSclass("assigned-resources-input"); Util.bind(intendedResourcesPerDayInput, new Util.Getter() { @Override @@ -339,7 +339,7 @@ public abstract class AllocationRow { private void initialize() { initializeResourcesPerDayInput(); - effortInput.setWidth("80px"); + effortInput.setSclass("assigned-hours-input"); effortInput.setConstraint(constraintForHoursInput()); loadEffort(); } @@ -365,9 +365,12 @@ public abstract class AllocationRow { private void onDifferentRealResourcesPerDay( ResourcesPerDay realResourcesPerDay) { + this.realResourcesPerDay.setSclass("assigned-resources-label"); this.realResourcesPerDay - .setTooltiptext(_("It can't allocate the intended resources per day")); - this.realResourcesPerDay.setValue(_("(achieved: {0})", + .setTooltiptext(_( + "Only {0} resources per day were achieved for current allocation", + realResourcesPerDay.getAmount().toPlainString())); + this.realResourcesPerDay.setValue(_("[{0}]", realResourcesPerDay.getAmount().toPlainString())); } diff --git a/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css b/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css index 349a23fd5..be082a7d2 100644 --- a/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css +++ b/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css @@ -1609,3 +1609,25 @@ input.z-datebox-text-disd { .z-button-clk .z-button-cr { background-position:-21px 0; } + +.assigned-hours-input { + width: 60px +} + +.assigned-resources-input { + width:40px; + float: left; + margin-left: 20px; +} + +.assigned-resources-label { + cursor: default; +} + +.assignedresources .details div.z-column-cnt { + font-weight: normal; +} + +.assignedresources .z-auxheader-cnt { + font-weight: bold; +} diff --git a/navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul b/navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul index 29b79608e..822f0fbe4 100644 --- a/navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul +++ b/navalplanner-webapp/src/main/webapp/planner/taskpanels/_tabPanelNonLimitingResourceAllocation.zul @@ -80,19 +80,19 @@ - + - + - - - - - - - - + + + + + + + +