diff --git a/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul b/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul index 8320232b6..cc84b7857 100644 --- a/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul +++ b/ganttzk/src/main/resources/web/ganttz/zul/plannerLayout.zul @@ -73,7 +73,7 @@ planner = self; -
+
diff --git a/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul b/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul index c5223daa3..83de1b71e 100644 --- a/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul +++ b/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul @@ -89,7 +89,7 @@ -
+
diff --git a/ganttzk/src/main/resources/web/js/ganttz/resourceload/resourcesloadlist.js b/ganttzk/src/main/resources/web/js/ganttz/resourceload/resourcesloadlist.js index 6dbcdab40..3770191ad 100644 --- a/ganttzk/src/main/resources/web/js/ganttz/resourceload/resourcesloadlist.js +++ b/ganttzk/src/main/resources/web/js/ganttz/resourceload/resourcesloadlist.js @@ -45,6 +45,24 @@ function addResourcesLoadListMethods(object) { return YAHOO.util.Selector.query('.taskspanelgap')[0]; } + function resourcesloadgraph() { + return YAHOO.util.Selector.query('.resourcesloadgraph div')[0]; + } + + function scrolledpannel() { + return YAHOO.util.Selector.query('.rightpanellayout div')[0]; + } + + + function timetrackergap() { + return YAHOO.util.Selector.query('.timetrackergap')[0]; + } + + function leftpanel() { + return YAHOO.util.Selector.query('.leftpanelgap .z-tree-body')[0]; + } + + object.init = function(cmp) { this.adjustTimeTrackerSize(cmp); YAHOO.util.Event.addListener(window, 'resize', @@ -59,16 +77,22 @@ function addResourcesLoadListMethods(object) { }; function listenToScroll() { - var onScroll = function() { - var scrolledpannel = YAHOO.util.Selector - .query('.rightpanellayout div')[0]; - elem = YAHOO.util.Selector.query('.timetrackergap')[0]; - elem.style["position"] = "relative"; - elem.style["left"] = "-" + scrolledpannel.scrollLeft + "px"; - var leftpanel = YAHOO.util.Selector.query('.leftpanelgap .z-tree-body')[0]; - leftpanel.style["position"] = "relative"; - leftpanel.style["top"] = "-" + scrolledpannel.scrollTop + "px"; + var timetrackergap_ = timetrackergap(); + var scrolledpannel_ = scrolledpannel(); + var resourcesloadgraph_ = resourcesloadgraph(); + var leftpanel_ = leftpanel(); + + var onScroll = function() { + timetrackergap_.style["position"] = "relative"; + timetrackergap_.style["left"] = "-" + scrolledpannel_.scrollLeft + "px"; + + leftpanel_.style["position"] = "relative"; + leftpanel_.style["top"] = "-" + scrolledpannel_.scrollTop + "px"; + + resourcesloadgraph_.style["position"] = "relative"; + resourcesloadgraph_.scrollLeft = scrolledpannel_.scrollLeft; + }; YAHOO.util.Selector.query('.rightpanellayout div')[0].onscroll = onScroll; diff --git a/ganttzk/src/main/resources/web/js/ganttz/tasklist.js b/ganttzk/src/main/resources/web/js/ganttz/tasklist.js index 89cf8fe88..3d340d27c 100644 --- a/ganttzk/src/main/resources/web/js/ganttz/tasklist.js +++ b/ganttzk/src/main/resources/web/js/ganttz/tasklist.js @@ -43,9 +43,29 @@ FOOTER_HEIGHT = 40; // Design-relative footer height SCROLLBAR_WIDTH = 15; // Scrollbars default width + +function scrolledpannel() { + return YAHOO.util.Selector.query('.rightpanellayout div')[0]; +} + +function leftpanel() { + return YAHOO.util.Selector.query('.leftpanelgap')[0]; +} + +function plannergraph() { + return YAHOO.util.Selector.query('.plannergraph div')[0]; +} + +function timetrackergap() { + return YAHOO.util.Selector.query('.timetrackergap')[0]; +} + +function rightpanellayout() { + return YAHOO.util.Selector.query('.rightpanellayout div')[0]; +} + zkTasklist.init = function(cmp) { zkTasklist.adjust_height(); - // relocateScrolls(); listenToScroll(); } @@ -58,19 +78,24 @@ zkTasklist.adjust_height = function(cmp) { /* Scrolls taskdetails compoent when scrolling ganttpanel component */ function listenToScroll() { - var onScroll = function() { - var scrolledpannel = YAHOO.util.Selector - .query('.rightpanellayout div')[0]; - elem = YAHOO.util.Selector.query('.timetrackergap')[0]; - elem.style["position"] = "relative"; - elem.style["left"] = "-" + scrolledpannel.scrollLeft + "px"; - var leftpanel = YAHOO.util.Selector.query('.leftpanelgap')[0]; - leftpanel.style["position"] = "relative"; - leftpanel.style["top"] = "-" + scrolledpannel.scrollTop + "px"; + timetrackergap_ = timetrackergap(); + scrolledpannel_ = scrolledpannel(); + leftpanel_ = leftpanel(); + rightpanellayout_ = rightpanellayout(); + plannergraph_ = plannergraph(); + + var onScroll = function() { + timetrackergap_.style["left"] = "-" + scrolledpannel_.scrollLeft + "px"; + + leftpanel_.style["position"] = "relative"; + leftpanel_.style["top"] = "-" + scrolledpannel_.scrollTop + "px"; + + plannergraph_.style["position"] = "relative"; + plannergraph_.scrollLeft = scrolledpannel_.scrollLeft; }; - YAHOO.util.Selector.query('.rightpanellayout div')[0].onscroll = onScroll; + rightpanellayout_.onscroll = onScroll; } diff --git a/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css b/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css index 9ed226f28..862dd6076 100644 --- a/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css +++ b/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css @@ -505,6 +505,10 @@ tr.z-vbox-sep { display:none; } +.timetrackergap { + position: relative; +} + .taskdetails_name { min-width: 150px; } @@ -523,4 +527,3 @@ div.z-tree { .plannerlayout, .resourcesloadlayout { height:500px; -} \ No newline at end of file