From 379827f6455138d89b244a86cfd9f91af75f68ca Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lorenzo=20Tilve=20=C3=81lvaro?= Date: Tue, 15 Nov 2011 23:09:35 +0100 Subject: [PATCH] Changed Textbox automatic width calculation in LeftTasksTree As the component is now allowed to use all remaining space, it's not needed any longer to calculate it based on the tree depth. FEA: ItEr75S04BugFixing --- .../java/org/zkoss/ganttz/LeftTasksTree.java | 13 +++--- .../web/ganttz/zul/leftTasksTreeRow.zul | 2 +- .../src/main/webapp/planner/css/ganttzk.css | 43 ++----------------- 3 files changed, 12 insertions(+), 46 deletions(-) diff --git a/ganttzk/src/main/java/org/zkoss/ganttz/LeftTasksTree.java b/ganttzk/src/main/java/org/zkoss/ganttz/LeftTasksTree.java index f99a07267..dfe968e77 100644 --- a/ganttzk/src/main/java/org/zkoss/ganttz/LeftTasksTree.java +++ b/ganttzk/src/main/java/org/zkoss/ganttz/LeftTasksTree.java @@ -54,6 +54,13 @@ import org.zkoss.zul.Treecell; import org.zkoss.zul.Treeitem; import org.zkoss.zul.TreeitemRenderer; +/** + * Tree element to display tasks structure in the planning Gantt
+ * + * @author Óscar González Fernández + * @author Manuel Rego Casasnovas + * @author Lorenzo Tilve Álvaro + */ public class LeftTasksTree extends HtmlMacroComponent { private final class TaskBeanRenderer implements TreeitemRenderer { @@ -75,9 +82,6 @@ public class LeftTasksTree extends HtmlMacroComponent { container.addExpandListener(expandListener); } - final int[] path = tasksTreeModel.getPath(tasksTreeModel.getRoot(), - task); - String cssClass = "depth_" + path.length; LeftTasksTreeRow leftTasksTreeRow = LeftTasksTreeRow.create( disabilityConfiguration, task, new TreeNavigator( tasksTreeModel, task), planner); @@ -96,9 +100,6 @@ public class LeftTasksTree extends HtmlMacroComponent { List rowChildren = row.getChildren(); List treeCells = ComponentsFinder.findComponentsOfType( Treecell.class, rowChildren); - for (Treecell cell : treeCells) { - cell.setSclass(cssClass); - } detailsForBeans.put(task, leftTasksTreeRow); deferredFiller.isBeingRendered(task, item); } diff --git a/ganttzk/src/main/resources/web/ganttz/zul/leftTasksTreeRow.zul b/ganttzk/src/main/resources/web/ganttz/zul/leftTasksTreeRow.zul index 8d8308085..2409289af 100644 --- a/ganttzk/src/main/resources/web/ganttz/zul/leftTasksTreeRow.zul +++ b/ganttzk/src/main/resources/web/ganttz/zul/leftTasksTreeRow.zul @@ -24,7 +24,7 @@ ]]> - + diff --git a/libreplan-webapp/src/main/webapp/planner/css/ganttzk.css b/libreplan-webapp/src/main/webapp/planner/css/ganttzk.css index 23253e9c3..635bba506 100644 --- a/libreplan-webapp/src/main/webapp/planner/css/ganttzk.css +++ b/libreplan-webapp/src/main/webapp/planner/css/ganttzk.css @@ -66,14 +66,14 @@ font-size: 10px !important; border-bottom: 0px; border-right: 0px; - border-top: 0px; - border-left: 1px dotted #86A4BE; + border-top: 0; + border-left: 0; height: 16px; padding-left:2px; } -.listdetails input.task_title { - width: auto; +.listdetails input.task-name { + border-left: dotted 1px #CCC; } .listdetails div.z-tree-cell-cnt { @@ -97,41 +97,6 @@ height: 19px; } -.listdetails .depth_1 input.task_title { - /*on change org.libreplan.web.print.CutyPrint.BASE_TASK_NAME_PIXEL must - be changed too */ - width: 82%; -} - -.listdetails .depth_2 input.task_title { - width: 78%; -} - -.listdetails .depth_3 .task_title { - width: 74%; -} - -.listdetails .depth_4 .task_title { - width: 70%; -} - -.listdetails .depth_5 .task_title { - width: 66%; -} - -.listdetails .depth_6 .task_title { - width: 62%; -} - -.listdetails .depth_7 .task_title { - width: 58%; -} - -.listdetails .depth_8 .task_title { - width: 54%; -} - - .listdetails { min-width:200px; }