diff --git a/mozilla/calendar/base/content/calendar-view-core.xml b/mozilla/calendar/base/content/calendar-view-core.xml index 19a15de79a5..c22e58215e1 100644 --- a/mozilla/calendar/base/content/calendar-view-core.xml +++ b/mozilla/calendar/base/content/calendar-view-core.xml @@ -228,10 +228,12 @@ } } - var alarmImage = document.getAnonymousElementByAttribute(this, "anonid", "alarm-image"); if ((item.alarmOffset || item.parentItem.alarmOffset) && - getPrefSafe("calendar.alarms.indicator.show", true) && - !item.calendar.getProperty("suppressAlarms")) { + getPrefSafe("calendar.alarms.indicator.show", true)) { + var alarmImage = document.getAnonymousElementByAttribute(this, "anonid", "alarm-image"); + if (item.calendar.getProperty("suppressAlarms")) { + alarmImage.setAttribute("suppressed", "true"); + } alarmImage.removeAttribute("hidden"); } ]]> diff --git a/mozilla/calendar/base/jar.mn b/mozilla/calendar/base/jar.mn index 9a848df8921..1de51d125fa 100644 --- a/mozilla/calendar/base/jar.mn +++ b/mozilla/calendar/base/jar.mn @@ -90,6 +90,7 @@ calendar.jar: content/calendar/sun-calendar-event-dialog-attendees.js (/calendar/prototypes/wcap/sun-calendar-event-dialog-attendees.js) % skin calendar classic/1.0 %skin/classic/calendar/ skin/classic/calendar/abcard.png (themes/common/abcard.png) + skin/classic/calendar/alarm-suppressed.png (themes/common/alarm-suppressed.png) skin/classic/calendar/alarm-flashing.png (themes/common/alarm-flashing.png) skin/classic/calendar/alarm.png (themes/common/alarm.png) #expand skin/classic/calendar/cal-icon32.png (themes/__THEME__/cal-icon32.png) diff --git a/mozilla/calendar/base/themes/common/alarm-suppressed.png b/mozilla/calendar/base/themes/common/alarm-suppressed.png new file mode 100644 index 00000000000..21bd46b9bb4 Binary files /dev/null and b/mozilla/calendar/base/themes/common/alarm-suppressed.png differ diff --git a/mozilla/calendar/base/themes/pinstripe/calendar-views.css b/mozilla/calendar/base/themes/pinstripe/calendar-views.css index 384f7b987ec..36420e55210 100644 --- a/mozilla/calendar/base/themes/pinstripe/calendar-views.css +++ b/mozilla/calendar/base/themes/pinstripe/calendar-views.css @@ -469,3 +469,7 @@ calendar-event-box[readOnly="true"]:hover .calendar-event-box-grippy-bottom { .alarm-image[flashing="true"] { list-style-image: url(chrome://calendar/skin/alarm-flashing.png); } + +.alarm-image[suppressed="true"] { + list-style-image: url(chrome://calendar/skin/alarm-suppressed.png); +} diff --git a/mozilla/calendar/base/themes/winstripe/calendar-views.css b/mozilla/calendar/base/themes/winstripe/calendar-views.css index 70502c08d60..e609208f07e 100644 --- a/mozilla/calendar/base/themes/winstripe/calendar-views.css +++ b/mozilla/calendar/base/themes/winstripe/calendar-views.css @@ -469,3 +469,7 @@ calendar-event-box[readOnly="true"]:hover .calendar-event-box-grippy-bottom { .alarm-image[flashing="true"] { list-style-image: url(chrome://calendar/skin/alarm-flashing.png); } + +.alarm-image[suppressed="true"] { + list-style-image: url(chrome://calendar/skin/alarm-suppressed.png); +}