diff --git a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TimeTracker.java b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TimeTracker.java index 3b39f1b91..20228a91f 100644 --- a/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TimeTracker.java +++ b/navalplanner-gantt-zk/src/main/java/org/zkoss/ganttz/TimeTracker.java @@ -51,6 +51,10 @@ public class TimeTracker extends HtmlMacroComponent { this.detailLevel = ZoomLevel.DETAIL_ONE; } + public ZoomLevel getZoomLevel() { + return this.detailLevel; + } + public void addZoomListener(IZoomLevelChangedListener listener) { zoomListeners .add(new WeakReference(listener)); diff --git a/navalplanner-gantt-zk/src/main/resources/web/ganttz/zul/timetracker.zul b/navalplanner-gantt-zk/src/main/resources/web/ganttz/zul/timetracker.zul index a3be72e26..61583f557 100644 --- a/navalplanner-gantt-zk/src/main/resources/web/ganttz/zul/timetracker.zul +++ b/navalplanner-gantt-zk/src/main/resources/web/ganttz/zul/timetracker.zul @@ -57,11 +57,21 @@ function onDecrease(id) { - + style="background-position: ${each.currentDayOffset}px"> + + + + + + + + + + @@ -70,4 +80,4 @@ function onDecrease(id) { - \ No newline at end of file + diff --git a/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css b/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css index 9452e0333..b54a55438 100644 --- a/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css +++ b/navalplanner-webapp/src/main/webapp/planner/css/ganttzk.css @@ -242,6 +242,11 @@ zkTasklist.GANTT_PANEL_LEFT = 300 background-color: #FFEEEE; !important; } +#watermark .weekend { + background-color: #FFEEEE; !important; +} + + /* Reduce spacing and font-size for watermark legend */ .z-columns, .z-column {