From 7a342ba56d104279b29f7bc2ee854443a5a282d1 Mon Sep 17 00:00:00 2001 From: nathangray Date: Mon, 12 Sep 2016 10:58:15 -0600 Subject: [PATCH] Update currently selected Add alarm time when start time changes --- calendar/js/app.js | 2 ++ calendar/templates/default/app.css | 2 +- calendar/templates/pixelegg/app.css | 4 ++-- 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/calendar/js/app.js b/calendar/js/app.js index 6b42353378..343f4e26f9 100644 --- a/calendar/js/app.js +++ b/calendar/js/app.js @@ -1062,6 +1062,8 @@ app.classes.calendar = (function(){ "use strict"; return AppJS.extend( recur_end.set_min(widget.getValue()); } } + // Update currently selected alarm time + this.alarm_custom_date(); }, /** diff --git a/calendar/templates/default/app.css b/calendar/templates/default/app.css index d73e50134a..b465c7c7af 100644 --- a/calendar/templates/default/app.css +++ b/calendar/templates/default/app.css @@ -607,7 +607,7 @@ Hide subsequent headers in week view with non-consolidated owners /* alarm_date widget disabled class */ .calendar_alarm_date_display { - display: none; + display: none !important; } /*overwirte margin applied by egwGridView*/ .calendar_alarm_grid{ diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css index 7a31ea00a4..3929979100 100755 --- a/calendar/templates/pixelegg/app.css +++ b/calendar/templates/pixelegg/app.css @@ -341,7 +341,7 @@ Hide subsequent headers in week view with non-consolidated owners width: calc(100% - 58px); margin-left: 58px; color: white; - background-color: #0C5DA5; + background-color: #2D6393; text-align: center; line-height: 1.5em; font-size: 14px; @@ -601,7 +601,7 @@ Hide subsequent headers in week view with non-consolidated owners /* alarm_date widget disabled class */ .calendar_alarm_date_display { - display: none; + display: none !important; } /*overwirte margin applied by egwGridView*/ .calendar_alarm_grid {