From 1ba95648777696424e53f5c4bda6e8a113caed4f Mon Sep 17 00:00:00 2001 From: Lorenzo Tilve Date: Wed, 5 Jan 2011 14:16:16 +0100 Subject: [PATCH] [Bug #781] Fix bug FEA: ItEr67S04BugFixing --- .../web/limitingresources/LimitingResourcesPanel.java | 9 +++++---- .../src/main/webapp/common/css/navalplan_zk.css | 4 ++++ 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesPanel.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesPanel.java index 8dbf5835f..a722744ef 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesPanel.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/limitingresources/LimitingResourcesPanel.java @@ -31,14 +31,13 @@ import org.joda.time.DateTime; import org.joda.time.Period; import org.joda.time.format.DateTimeFormat; import org.joda.time.format.DateTimeFormatter; -import org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueDependency; import org.navalplanner.business.planner.limiting.entities.LimitingResourceQueueElement; import org.navalplanner.business.resources.daos.IResourceDAO; import org.navalplanner.business.resources.entities.LimitingResourceQueue; import org.springframework.beans.factory.annotation.Autowired; import org.zkoss.ganttz.timetracker.TimeTracker; -import org.zkoss.ganttz.timetracker.TimeTracker.IDetailItemFilter; import org.zkoss.ganttz.timetracker.TimeTrackerComponent; +import org.zkoss.ganttz.timetracker.TimeTracker.IDetailItemFilter; import org.zkoss.ganttz.timetracker.zoom.DetailItem; import org.zkoss.ganttz.timetracker.zoom.IZoomLevelChangedListener; import org.zkoss.ganttz.timetracker.zoom.ZoomLevel; @@ -543,8 +542,10 @@ public class LimitingResourcesPanel extends HtmlMacroComponent { itemEnd = itemEnd.plus(intervalIncrease()); } } - horizontalPagination.setDisabled(horizontalPagination.getItems() - .size() < 2); + if (horizontalPagination.getItems().size() < 2) { + horizontalPagination.setDisabled(true); + horizontalPagination.setSelectedIndex(0); + } } public void goToHorizontalPage(int interval) { 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 25c57f622..af5355afe 100644 --- a/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css +++ b/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css @@ -1209,6 +1209,10 @@ tr.z-tree-row-seld, tr.z-list-item-seld, padding: 10px; } +.resourcesload .z-west-body .z-tree-header , +.limitingresources .z-west-body .z-tree-header { + width: 100% !important; +} .z-tab-accordion-hm, .z-tab-accordion-hr, .z-tab-accordion-hl { -moz-background-clip:border;