From 03a4194e090eaca24c523f0c5d68164cfcf38ab1 Mon Sep 17 00:00:00 2001 From: Lorenzo Tilve Date: Wed, 14 Oct 2009 17:32:26 +0200 Subject: [PATCH] ItEr30S05RFComportamentoGraficoPlanificadorItEr23S12: Timetracker graphical enhancements in resourcesload tab --- .../web/ganttz/zul/resourcesLoadLayout.zul | 2 +- .../ganttz/resourceload/resourcesloadlist.js | 7 ------ .../src/main/webapp/js/advanceAllocations.js | 25 +++++++++++++++++++ .../src/main/webapp/planner/css/ganttzk.css | 14 ++++++----- 4 files changed, 34 insertions(+), 14 deletions(-) diff --git a/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul b/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul index 83de1b71e..288a60dfa 100644 --- a/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul +++ b/ganttzk/src/main/resources/web/ganttz/zul/resourcesLoadLayout.zul @@ -53,7 +53,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 3770191ad..8a07a407a 100644 --- a/ganttzk/src/main/resources/web/js/ganttz/resourceload/resourcesloadlist.js +++ b/ganttzk/src/main/resources/web/js/ganttz/resourceload/resourcesloadlist.js @@ -18,8 +18,6 @@ * along with this program. If not, see . */ -var TIMETRACKER_OFFSET_TOP = 120; - zkResourcesLoadList = addResourcesLoadListMethods( {}); function addResourcesLoadListMethods(object) { @@ -84,13 +82,8 @@ function addResourcesLoadListMethods(object) { 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; }; diff --git a/navalplanner-webapp/src/main/webapp/js/advanceAllocations.js b/navalplanner-webapp/src/main/webapp/js/advanceAllocations.js index 07350f679..37f500367 100644 --- a/navalplanner-webapp/src/main/webapp/js/advanceAllocations.js +++ b/navalplanner-webapp/src/main/webapp/js/advanceAllocations.js @@ -17,3 +17,28 @@ * You should have received a copy of the GNU Affero General Public License * along with this program. If not, see . */ + +// Check if this is advanced location tab + +function plannergraph() { + return YAHOO.util.Selector.query('.plannergraph div')[0]; +} + + + function listenToScroll() { + + var timetrackergap_ = timetrackergap(); + var scrolledpannel_ = scrolledpannel(); + var resourcesloadgraph_ = resourcesloadgraph(); + var leftpanel_ = leftpanel(); + + var onScroll = function() { + timetrackergap_.style["left"] = "-" + scrolledpannel_.scrollLeft + "px"; + leftpanel_.style["top"] = "-" + scrolledpannel_.scrollTop + "px"; + resourcesloadgraph_.scrollLeft = scrolledpannel_.scrollLeft; + + }; + + YAHOO.util.Selector.query('.rightpanellayout div')[0].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 48e52dc27..8c5071234 100644 --- a/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css +++ b/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css @@ -607,24 +607,26 @@ div.z-tree { display:visible; margin-top:10px; } + .listdetails { position:relative; top:-18px; } - -.plannerlayout div.z-tree, .plannerlayout div.z-grid { +.plannerlayout div.z-tree, .plannerlayout div.z-grid, +.resourcesload div.z-tree, .resourcesload div.z-grid { border: 0; } #timetrackerheader table { -height:15px; + height:15px; } #timetrackerheader .z-grid-body { -display:none; + display:none; } -.taskheaderscontainer, .leftpanelgap, .plannergraph div { - position:relative"; +.taskheaderscontainer, .leftpanelgap, .plannergraph div, +.resourcesloadgraph div { + position:relative; } \ No newline at end of file