From 70aa231264aeae6f3afe1463d6b3ced9ddc829f3 Mon Sep 17 00:00:00 2001
From: Lorenzo Tilve <ltilve@igalia.com>
Date: Tue, 4 Jan 2011 11:59:53 +0100
Subject: [PATCH] [Bug #759] Fixed problem with first watermark column width in
 week view

FEA: ItEr67S04BugFixing
---
 .../timetracker/timetrackersecondlevel.zul    | 20 ++++---------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/ganttzk/src/main/resources/web/ganttz/zul/timetracker/timetrackersecondlevel.zul b/ganttzk/src/main/resources/web/ganttz/zul/timetracker/timetrackersecondlevel.zul
index a3bf46f8a..5ec5ec27c 100644
--- a/ganttzk/src/main/resources/web/ganttz/zul/timetracker/timetrackersecondlevel.zul
+++ b/ganttzk/src/main/resources/web/ganttz/zul/timetracker/timetrackersecondlevel.zul
@@ -23,27 +23,15 @@
         <n:table style="width: ${top.horizontalSize-2}px;" class="second_level_">
 
             <n:tr class="z-columns">
-                <n:th class="z-column" forEach="${top.detailsSecondLevel}"
-                style="width: ${each.size}px">
+                <n:th class="z-column" forEach="${top.detailsSecondLevel}" style="width: ${each.size}px">
                 ${each.name}
                 </n:th>
             </n:tr>
             <n:tr id="watermark">
-                <n:td class="timetracker_column${(each.even and (top.zoomLevel != 'DETAIL_FOUR'))?'_even':''}
-                    ${(each.bankHoliday?'bankHoliday':'')}
-                    ${(each.currentPeriod?'timetracker_column_today':' ')}
-                    ${(each.deadlinePeriod?'timetracker_column_deadline':'')}"
+                <n:td class="timetracker_column${(each.even and (top.zoomLevel != 'DETAIL_FOUR'))?'_even':''}${(each.bankHoliday?' bankHoliday':'')}${(each.currentPeriod?' timetracker_column_today':' ')}${(each.deadlinePeriod?' timetracker_column_deadline':'')}"
                     forEach="${top.detailsSecondLevel}"
-                    style="background-position: ${each.backgroundOffset}">
-                    <n:div if="${each.currentPeriod and each.deadlinePeriod}"  class="today_deadline" style="background-position: ${each.currentDayOffset}px" />
-                    <n:table class="week_element" width="100%" height="100%" if="${top.zoomLevel == 'DETAIL_FOUR'}">
-                    <n:tr>
-                        <n:td/><n:td/><n:td/><n:td/><n:td/>
-                        <n:td class="weekend" />
-                        <n:td class="weekend" />
-                    </n:tr>
-                  </n:table>
-
+                    style="background-position: ${each.backgroundOffset}; width: ${each.size}px;">
+                    <n:div if="${each.currentPeriod and each.deadlinePeriod}" class="today_deadline" style="background-position: ${each.currentDayOffset}px" />
                 </n:td>
             </n:tr>
         </n:table>