restore highlighting of current period; jquery.calendar's customDate hook was renamed to beforeShowDay in datepicker

2 files changed, 78 insertions, 0 deletions

diff --git a/plugins/CoreHome/templates/calendar.js b/plugins/CoreHome/templates/calendar.js
index 8318555110..506f994e00 100644
--- a/plugins/CoreHome/templates/calendar.js
+++ b/plugins/CoreHome/templates/calendar.js
@@ -14,6 +14,78 @@ var todayMonth = todayDate.getMonth();
 var todayYear = todayDate.getFullYear();
 var todayDay = todayDate.getDate();
 
+function highlightCurrentPeriod( date )
+{
+	var valid = false;
+
+	var dateMonth = date.getMonth();
+	var dateYear = date.getFullYear();
+	var dateDay = date.getDate();
+	var style = '';
+
+	// we don't color dates in the future
+	if( dateMonth == todayMonth
+		&& dateYear == todayYear
+		&& dateDay >= todayDay
+	)
+	{
+		return [true, ''];
+	}
+
+	// we don't color dates before the minimum date
+	if( dateYear < piwik.minDateYear
+		|| ( dateYear == piwik.minDateYear
+				&&
+					(
+						(dateMonth == piwik.minDateMonth - 1
+						&& dateDay < piwik.minDateDay)
+					||  (dateMonth < piwik.minDateMonth - 1)
+				)
+			)
+	)
+	{
+		return [true, ''];
+	}
+
+	// we color all day of the month for the same year for the month period
+	if(piwik.period == "month"
+		&& dateMonth == currentMonth
+		&& dateYear == currentYear
+	)
+	{
+		valid = true;
+	}
+	// we color all day of the year for the year period
+	else if(piwik.period == "year"
+			&& dateYear == currentYear
+	)
+	{
+		valid = true;
+	}
+	else if(piwik.period == "week"
+			&& date.getWeek() == currentDate.getWeek()
+			&& dateYear == currentYear
+	)
+	{
+		valid = true;
+	}
+	else if( piwik.period == "day"
+				&& dateDay == currentDay
+				&& dateMonth == currentMonth
+				&& dateYear == currentYear
+		)
+	{
+		valid = true;
+	}
+
+	if(valid)
+	{
+		return [true, 'ui-datepicker-current-period'];
+	}
+
+	return [true, ''];
+}
+
 function updateDate(dateText, inst)
 {
 	var date = dateText;
@@ -33,6 +105,7 @@ $(document).ready(function(){
 		prevText: "",
 		nextText: "",
 		currentText: "",
+		beforeShowDay: highlightCurrentPeriod,
 		defaultDate: currentDate,
 		changeMonth: true,
 		changeYear: true,
diff --git a/plugins/CoreHome/templates/styles.css b/plugins/CoreHome/templates/styles.css
index df3eb30bf0..0e35c66947 100644
--- a/plugins/CoreHome/templates/styles.css
+++ b/plugins/CoreHome/templates/styles.css
@@ -50,6 +50,11 @@ div.ui-datepicker {
 	font-size: 62.5%;
 }
 
+.ui-datepicker-current-period a, .ui-datepicker-current-period a:link, .ui-datepicker-current-period a:visited {
+	border: 1px solid #2E85FF;
+	color: #2E85FF;
+}
+
 #otherPeriods a {
 	text-decoration: none;
 }