From 58490c24b710cc8431d200653a3a891a522073e8 Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Tue, 24 Jul 2018 16:20:50 -0600
Subject: [PATCH] * Calendar - add birthday icon to planner for time scales
 less than a month

---
 calendar/js/et2_widget_planner.js   | 11 ++++++++---
 calendar/templates/default/app.css  |  2 +-
 calendar/templates/pixelegg/app.css |  2 +-
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/calendar/js/et2_widget_planner.js b/calendar/js/et2_widget_planner.js
index cdba50590b..5434028842 100644
--- a/calendar/js/et2_widget_planner.js
+++ b/calendar/js/et2_widget_planner.js
@@ -1149,6 +1149,8 @@ var et2_calendar_planner = (function(){ "use strict"; return et2_calendar_view.e
 			tempDate.setMinutes(tempDate.getMinutes()-tempDate.getTimezoneOffset());
 			var title = '';
 			var state = '';
+			state = new Date(t.valueOf() - t.getTimezoneOffset() * 60 * 1000);
+			var day_class = this.day_class_holiday(state,holidays, days);
 
 			if (days <= 3)
 			{
@@ -1162,8 +1164,6 @@ var et2_calendar_planner = (function(){ "use strict"; return et2_calendar_view.e
 			{
 				title = this.egw().lang(date('D',t)).substr(0,2)+'<br />'+date('j',t);
 			}
-			state = new Date(t.valueOf() - t.getTimezoneOffset() * 60 * 1000);
-			var day_class = this.day_class_holiday(state,holidays);
 
 			content += '<div class="calendar_plannerDayScale et2_clickable et2_link '+ day_class+
 				'" data-date=\'' + state.toJSON() +'\''+
@@ -1224,10 +1224,11 @@ var et2_calendar_planner = (function(){ "use strict"; return et2_calendar_view.e
 	 *
 	 * @param {Date} date
 	 * @param {string[]} holiday_list Filled with a list of holidays for that day
+	 * @param {integer} days Number of days shown in the day header
 	 *
 	 * @return {string} CSS Classes for the day.  calendar_calBirthday, calendar_calHoliday, calendar_calToday and calendar_weekend as appropriate
 	 */
-	day_class_holiday: function(date,holiday_list) {
+	day_class_holiday: function(date,holiday_list, days) {
 
 		if(!date) return '';
 
@@ -1247,6 +1248,10 @@ var et2_calendar_planner = (function(){ "use strict"; return et2_calendar_view.e
 				if (typeof holidays[i]['birthyear'] !== 'undefined')
 				{
 					day_class += ' calendar_calBirthday ';
+					if(typeof days == 'undefined' || days <= 21)
+					{
+						day_class += ' calendar_calBirthdayIcon ';
+					}
 
 					holiday_list.push(holidays[i]['name']);
 				}
diff --git a/calendar/templates/default/app.css b/calendar/templates/default/app.css
index c6a011e2fc..8f9a6d2cab 100644
--- a/calendar/templates/default/app.css
+++ b/calendar/templates/default/app.css
@@ -270,7 +270,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 .calendar_calBirthday,.calendar_calBirthday a{
 	color: #626161;
 }
-#calendar-view .calendar_calBirthday {
+#calendar-view .calendar_calBirthday, #calendar-planner .calendar_plannerHeader .calendar_calBirthdayIcon {
 	background-image: url(images/cake.png);
     background-repeat: no-repeat;
     background-size: 16px;
diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css
index bc995c47f6..93c3ebfe5f 100755
--- a/calendar/templates/pixelegg/app.css
+++ b/calendar/templates/pixelegg/app.css
@@ -276,7 +276,7 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 .calendar_calBirthday a {
   color: #626161;
 }
-#calendar-view .calendar_calBirthday {
+#calendar-view .calendar_calBirthday, #calendar-planner .calendar_plannerHeader .calendar_calBirthdayIcon {
   background-image: url(images/cake.png);
   background-repeat: no-repeat;
   background-size: 16px;