From 9827bebf7f63f1068f33b4675ce7f779fff83139 Mon Sep 17 00:00:00 2001 From: Manuel Rego Casasnovas Date: Wed, 26 Aug 2009 16:27:05 +0200 Subject: [PATCH] ItEr23S08CUEdicionCalendarioLaboral: Fixed some minor visual issues. --- .../web/common/components/CalendarHighlightedDays.java | 6 +++--- .../webapp/common/components/calendarhighlighteddays.zul | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/CalendarHighlightedDays.java b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/CalendarHighlightedDays.java index 8b3558bc7..500caabf5 100644 --- a/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/CalendarHighlightedDays.java +++ b/navalplanner-webapp/src/main/java/org/navalplanner/web/common/components/CalendarHighlightedDays.java @@ -68,9 +68,9 @@ public class CalendarHighlightedDays extends HtmlMacroComponent { public void highlightDays() { String javascript = "highlightDays('" + ancestorExceptionDays - + "', 'black', 'orange', '" + ownExceptionDays - + "', 'black', 'red', '" + zeroHoursDays - + "', 'white', 'lightgrey', 'lightgrey', 'white', '" + + "', 'white', 'orange', '" + ownExceptionDays + + "', 'white', 'red', '" + zeroHoursDays + + "', 'red', 'white', 'lightgrey', 'white', '" + getCalendarUuid() + "');"; Clients.evalJavaScript(javascript); diff --git a/navalplanner-webapp/src/main/webapp/common/components/calendarhighlighteddays.zul b/navalplanner-webapp/src/main/webapp/common/components/calendarhighlighteddays.zul index 6e8950013..54249b0a2 100644 --- a/navalplanner-webapp/src/main/webapp/common/components/calendarhighlighteddays.zul +++ b/navalplanner-webapp/src/main/webapp/common/components/calendarhighlighteddays.zul @@ -40,10 +40,10 @@ function highlightDays(ancestorExceptionDays, ancestorExceptionColor, ancestorEx "color:" + zeroHoursColor + ";background-color:" + zeroHoursBgColor); } else if (ownExceptions.in_array(day)) { nodes[i].setAttribute("style", - "color:" + ownExceptionColor + ";background-color:" + ownExceptionBgColor); + "color:" + ownExceptionColor + ";background-color:" + ownExceptionBgColor + ";font-weight: bold"); } else if (ancestorExceptions.in_array(day)) { nodes[i].setAttribute("style", - "color:" + ancestorExceptionColor + ";background-color:" + ancestorExceptionBgColor); + "color:" + ancestorExceptionColor + ";background-color:" + ancestorExceptionBgColor + ";font-weight: bold"); } else { nodes[i].removeAttribute("style"); }