From edb594de6a91103fa94f6d5b30e0b0fda1dfe0ab Mon Sep 17 00:00:00 2001 From: Lorenzo Tilve Date: Wed, 21 Apr 2010 12:40:20 +0200 Subject: [PATCH] ItEr55S04ValidacionEProbasFuncionaisItEr54S04: Fixed interface problems inside resources load tree --- .../resourceload/ResourceLoadLeftPane.java | 11 +++----- .../main/webapp/common/css/navalplan_zk.css | 1 + .../src/main/webapp/planner/css/ganttzk.css | 27 +++++++++++++++++++ 3 files changed, 32 insertions(+), 7 deletions(-) diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadLeftPane.java b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadLeftPane.java index ca22da4d9..54e713795 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadLeftPane.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/resourceload/ResourceLoadLeftPane.java @@ -83,28 +83,25 @@ MutableTreeModel modelForTree, Component component = createComponent(line); item.appendChild(row); row.appendChild(cell); - cell.appendChild(component); - appendOperations(row, line); + appendOperations(cell, line); + + cell.appendChild(component); collapse(line); addExpandedListener(item, line); } - private void appendOperations(final Treerow row, + private void appendOperations(final Treecell cell, final LoadTimeLine line) { if (line.getRole().isVisibleScheduled()) { - Treecell cell = new Treecell(); appendButtonPlan(cell, line); - row.appendChild(cell); } } private void appendButtonPlan(final Treecell cell, final LoadTimeLine taskLine) { Button buttonPlan = new Button(); - buttonPlan.setWidth("5px"); - buttonPlan.setHeight("5px"); buttonPlan.setSclass("icono"); buttonPlan.setImage("/common/img/ico_planificador1.png"); buttonPlan.setHoverImage("/common/img/ico_planificador.png"); 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 ebf5b6125..ba9016cd7 100644 --- a/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css +++ b/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css @@ -81,6 +81,7 @@ table { display: none; } +.icono .z-button-cm, body .z-window-embedded .icono .z-button-cm, body .z-window-modal .icono .z-button-cm, body .advancedallocationlayout .icono .z-button-cm { diff --git a/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css b/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css index d631816a2..7bd813aa5 100644 --- a/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css +++ b/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css @@ -494,6 +494,21 @@ tr.z-vbox-sep { display: inline; } +.resourceloadleftpane .secondlevel .z-label, +.resourceloadleftpane .z-tree-body { + white-space: nowrap; +} + +.resourceloadleftpane .icono { + margin-top: 0px; + margin-bottom: 0px; + border: 0px; +} + +.resourceloadleftpane .icono img { + height: 18px; +} + /* -- Upper taskpannel is hidden --*/ .taskspanelgap #timetracker { border-top: 0px; @@ -579,6 +594,18 @@ tr.z-vbox-sep { font-size: 10px; } +.resourceloadleftpane div.z-tree-body { + overflow: visible; +} +.resourceloadleftpane div.z-tree-body table { + table-layout:auto !important; +} + +.resourceloadleftpane .icono .z-button-cm:active, +.resourceloadleftpane .icono .z-button-cm:hover { + border: 0; + background-color: transparent; +} .timetrackergap { position: relative;