diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java index 2cb1080fb..8835c15d2 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/planner/allocation/AdvancedAllocationController.java @@ -376,7 +376,7 @@ public class AdvancedAllocationController extends GenericForwardComposer { TimeTrackedTableWithLeftPane timeTrackedTableWithLeftPane = new TimeTrackedTableWithLeftPane( getDataSource(), getColumnsForLeft(), getLeftRenderer(), getRightRenderer(), timeTracker); - + Clients.evalJavaScript("ADVANCE_ALLOCATIONS.listenToScroll();"); timeTracker.addZoomListener(new IZoomLevelChangedListener() { @Override public void zoomLevelChanged(ZoomLevel detailLevel) { @@ -385,6 +385,7 @@ public class AdvancedAllocationController extends GenericForwardComposer { }); table = timeTrackedTableWithLeftPane.getRightPane(); leftPane = timeTrackedTableWithLeftPane.getLeftPane(); + leftPane.setFixedLayout(true); } private void insertComponentsInLayout() { diff --git a/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css b/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css index 82b3e7e14..7435fa700 100644 --- a/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css +++ b/navalplanner-webapp/src/main/webapp/common/css/navalpro_zk.css @@ -177,7 +177,8 @@ button.z-button { padding: 2px 1px 1px 2px; } -.planner-command .z-button-cm { +.planner-command .z-button-cm, +.advancedallocationlayout .z-north-body .z-button-cm { height: 24px; padding: 2px; } @@ -970,3 +971,7 @@ tr.z-tree-row-seld, tr.z-list-item-seld, z-index: 2; color: transparent; } + +.advancedassignmentdetails .hours { + min-width: 30px; +} diff --git a/navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul b/navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul index a52b0e22c..ef77ef1e5 100644 --- a/navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul +++ b/navalplanner-webapp/src/main/webapp/planner/advance_allocation.zul @@ -30,12 +30,13 @@ -