From 36f100ea2ef45c23bb71b9abc50eec69b2fc0c4b Mon Sep 17 00:00:00 2001 From: "mozilla%kewis.ch" Date: Thu, 15 May 2008 15:27:05 +0000 Subject: [PATCH] Fix bug 433352 (and bug 416604, bug 432957) - Day/week view: category color is used for the entire event box (regression). r=berend git-svn-id: svn://10.0.0.236/trunk@251652 18797224-902f-48f8-a5cc-f745e15eee43 --- .../calendar/base/content/agenda-listbox.xml | 89 +++++++++---------- .../base/content/calendar-month-view.xml | 24 ++--- .../base/content/calendar-multiday-view.xml | 4 +- .../base/content/calendar-view-core.xml | 39 ++++---- .../calendar/base/content/calendar-views.js | 6 +- 5 files changed, 69 insertions(+), 93 deletions(-) diff --git a/mozilla/calendar/base/content/agenda-listbox.xml b/mozilla/calendar/base/content/agenda-listbox.xml index 67cfbec45b9..b28fc2a71bb 100644 --- a/mozilla/calendar/base/content/agenda-listbox.xml +++ b/mozilla/calendar/base/content/agenda-listbox.xml @@ -43,11 +43,30 @@ xmlns:xul="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul" xmlns:xbl="http://www.mozilla.org/xbl"> - + + null; + + + + + + + + + + null; - null; + + + @@ -81,11 +104,6 @@ } ]]> - - - - - - + extends="chrome://calendar/content/agenda-listbox.xml#agenda-base-richlist-item"> - + @@ -111,54 +127,35 @@ - null; null; - - - - - - - - + extends="chrome://calendar/content/agenda-listbox.xml#agenda-base-richlist-item"> - - - - - - - + + + + + + + @@ -166,12 +163,11 @@ - null; - - - diff --git a/mozilla/calendar/base/content/calendar-month-view.xml b/mozilla/calendar/base/content/calendar-month-view.xml index 6885059abb4..c4cb102f8e2 100644 --- a/mozilla/calendar/base/content/calendar-month-view.xml +++ b/mozilla/calendar/base/content/calendar-month-view.xml @@ -52,11 +52,14 @@ xmlns:xbl="http://www.mozilla.org/xbl"> - + - + - - - - +