diff --git a/ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul b/ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul index 305bee568..2d7b955ae 100644 --- a/ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul +++ b/ganttzk/src/main/resources/web/ganttz/zul/leftTasksTree.zul @@ -17,13 +17,12 @@ You should have received a copy of the GNU Affero General Public License along with this program. If not, see . --> -
- - - - - + + + + +
\ No newline at end of file diff --git a/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul b/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul index b2d6d1781..74c161395 100644 --- a/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul +++ b/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul @@ -48,26 +48,9 @@ planner = self;
- - - - - - - - - - - - - -
+
-
-
-
diff --git a/ganttzk/src/main/resources/web/js/ganttz/tasklist.js b/ganttzk/src/main/resources/web/js/ganttz/tasklist.js index 097b78ef0..e93b165cd 100644 --- a/ganttzk/src/main/resources/web/js/ganttz/tasklist.js +++ b/ganttzk/src/main/resources/web/js/ganttz/tasklist.js @@ -124,8 +124,8 @@ function scrolledpannel() { return YAHOO.util.Selector.query('.rightpanellayout div')[0]; } -function leftpanel() { - return YAHOO.util.Selector.query('.leftpanelgap')[0]; +function taskdetailsBody() { + return YAHOO.util.Selector.query('.listdetails .z-tree-body')[0]; } function plannergraph() { @@ -167,7 +167,6 @@ function timeplotcontainer_all() { zkTasklist.init = function(cmp) { zkTasklist.adjust_height(); listenToScroll(); - listenToTaskDetailsScroll(); } /* Resizes ganttpanel heigh to fit window size */ @@ -182,7 +181,7 @@ function listenToScroll() { timetrackergap_ = timetrackergap(); scrolledpannel_ = scrolledpannel(); - leftpanel_ = leftpanel(); + leftpanel_ = taskdetailsBody(); rightpanellayout_ = rightpanellayout(); plannergraph_ = plannergraph(); @@ -204,18 +203,6 @@ function listenToScroll() { } -function listenToTaskDetailsScroll() { - timetrackergap_ = timetrackergap(); - taskheaderscontainer_ = taskheaderscontainer(); - - var onScrollTaskDetails = function() { - taskheaderscontainer__.style["left"] = "-" + leftpanel_.scrollLeft + "px"; - }; - leftpanel_.onscroll = onScrollTaskDetails; - -} - - /* * Move scrollbars to locate them on left and bottom window borders */ 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 4c3bf5a8c..da10dff2a 100644 --- a/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css +++ b/navalplanner-webapp/src/main/webapp/common/css/navalplan_zk.css @@ -623,7 +623,10 @@ div.z-grid { .listdetails .z-textbox, .listdetails .z-decimalbox, .listdetails .z-intbox, .listdetails .z-longbox, .listdetails .z-doublebox { - height: 17px; + height: 15px; +} +.listdetails input { + padding-top: 6px; } .z-tree .z-datebox-inp { @@ -687,6 +690,10 @@ div.z-grid { font-family: Tahoma, Arial, Helvetica, sans-serif; } +.taskTreeCols div.z-tree-header, .taskTreeCols div.z-tree-header tr { + overflow: visible; +} + .advance-measurement { width: 340px; } diff --git a/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css b/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css index d819b5434..7888fcf94 100644 --- a/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css +++ b/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css @@ -26,15 +26,22 @@ */ /* -------------- Listdetails -------------- */ - /* External listdetails box */ .listdetails { margin-top: 0px; font-size: 10px !important; - margin-top: 0px; } -#listdetails_container { - position: relative; +#listdetails_container .z-tree-header table { + position:relative; + z-index: 4; +} + +.listdetails .z-tree-body { + margin-top: -18px; +} + +.listdetails div.z-tree { + background: #FFFFFF; } .listdetails img { @@ -51,8 +58,13 @@ padding: 0px; } +.listdetails th.z-tree-col .z-tree-col-cnt { + font-size:11px; + font-weight:bold; +} + .listdetails input { - width: 65px; + width: 100%; font-size: 10px !important; border-bottom: 0px; border-right: 0px; @@ -69,9 +81,8 @@ border-right: 0px; } -.listdetails input .listdetails input { - min-width: 90px; + /* min-width: 90px; */ height: 19px; } @@ -92,7 +103,7 @@ } .listdetails { -min-width:200px; + min-width:200px; } .listdetails div.z-tree-header th.z-tree-col { @@ -798,7 +809,7 @@ div.z-tree { } .listdetails .z-tree-header table { - display:none; + /* display:none; */ } .plannerlayout div.z-tree, .plannerlayout div.z-grid,