From e499ec465221086920a2a900ea67ffef596a0e52 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Tue, 3 Jan 2012 08:57:43 +0100 Subject: [PATCH] [Bug #1321] Reseting highlighted days in calendar to prevent issue FEA: ItEr75S04BugFixing --- .../web/calendars/BaseCalendarEditionController.java | 2 ++ libreplan-webapp/src/main/webapp/calendars/_edition.zul | 8 ++++++++ 2 files changed, 10 insertions(+) diff --git a/libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java b/libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java index 1de2afc2d..4b38ad100 100644 --- a/libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java +++ b/libreplan-webapp/src/main/java/org/libreplan/web/calendars/BaseCalendarEditionController.java @@ -537,6 +537,8 @@ public abstract class BaseCalendarEditionController extends public void highlightDaysOnCalendar() { Calendar calendar = (Calendar) window.getFellow("calendarWidget"); + Clients.response(new AuInvoke(calendar, "resetHighlightedDates")); + Map> daysByColor = getDaysCurrentMonthByColor(); for (String color : daysByColor.keySet()) { Clients.response(new AuInvoke(calendar, "highlightDates", diff --git a/libreplan-webapp/src/main/webapp/calendars/_edition.zul b/libreplan-webapp/src/main/webapp/calendars/_edition.zul index 082bd7d91..b61d68ca7 100644 --- a/libreplan-webapp/src/main/webapp/calendars/_edition.zul +++ b/libreplan-webapp/src/main/webapp/calendars/_edition.zul @@ -81,6 +81,14 @@ }); } + + function () { + var nodes = $('td', this).not('.z-outside'); + nodes.each(function () { + $(this).css({color: "black", backgroundColor: "white"}); + }); + } +