From 27ef0c20a960d07229c1fb38b7f3db8db89a2b1c Mon Sep 17 00:00:00 2001
From: nathangray <nathangray.bsc+github@gmail.com>
Date: Wed, 15 Jun 2016 09:17:12 -0600
Subject: [PATCH] Supress tooltip on holidays shown as events

---
 calendar/js/et2_widget_daycol.js    |  6 ++++--
 calendar/js/et2_widget_event.js     |  3 ++-
 calendar/templates/default/app.css  |  4 ++++
 calendar/templates/mobile/app.css   | 14 ++++++++++++++
 calendar/templates/pixelegg/app.css |  5 +++++
 5 files changed, 29 insertions(+), 3 deletions(-)

diff --git a/calendar/js/et2_widget_daycol.js b/calendar/js/et2_widget_daycol.js
index dc5867ea8f..fe3e33bd87 100644
--- a/calendar/js/et2_widget_daycol.js
+++ b/calendar/js/et2_widget_daycol.js
@@ -434,7 +434,8 @@ var et2_calendar_daycol = (function(){ "use strict"; return et2_valueWidget.exte
 								end: this.options.date,
 								owner: this.options.owner,
 								participants: this.options.owner,
-								app: 'calendar'
+								app: 'calendar',
+								class: 'calendar_calBirthday'
 							},
 							readonly: true,
 							class: 'calendar_calBirthday'
@@ -469,7 +470,8 @@ var et2_calendar_daycol = (function(){ "use strict"; return et2_valueWidget.exte
 								end: this.options.date,
 								owner: this.options.owner,
 								participants: this.options.owner,
-								app: 'calendar'
+								app: 'calendar',
+								class: 'calendar_calBirthday'
 							},
 							readonly: true,
 							class: 'calendar_calHoliday'
diff --git a/calendar/js/et2_widget_event.js b/calendar/js/et2_widget_event.js
index e1ee54d39b..9fc3ce51df 100644
--- a/calendar/js/et2_widget_event.js
+++ b/calendar/js/et2_widget_event.js
@@ -494,7 +494,8 @@ var et2_calendar_event = (function(){ "use strict"; return et2_valueWidget.exten
 			cat.destroy();
 		}
 
-		return '<div class="calendar_calEventTooltip ' + this._status_class() + '" style="border-color: '+border+'; background-color: '+bg_color+';">'+
+		return '<div class="calendar_calEventTooltip ' + this._status_class() +' '+ this.options.class +
+			'" style="border-color: '+border+'; background-color: '+bg_color+';">'+
 			'<div class="calendar_calEventHeaderSmall">'+
 				'<font style="color:'+header_color+'">'+timespan+'</font>'+
 				this.icons[0].outerHTML+
diff --git a/calendar/templates/default/app.css b/calendar/templates/default/app.css
index 18327e2840..13ee4451fb 100644
--- a/calendar/templates/default/app.css
+++ b/calendar/templates/default/app.css
@@ -241,6 +241,10 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 .calendar_calBirthday,.calendar_calBirthday a{
 	color: #626161;
 }
+/* Supress tooltips on holidays shown as events */
+.calendar_calEventTooltip.calendar_calBirthday, .calendar_calEventTooltip.calendar_calHoliday {
+	display: none;
+}
 
 /* timeGridWidget, contains timeRow's and dayCol's
  */
diff --git a/calendar/templates/mobile/app.css b/calendar/templates/mobile/app.css
index a8a88ff7af..3c5857e0c8 100644
--- a/calendar/templates/mobile/app.css
+++ b/calendar/templates/mobile/app.css
@@ -261,6 +261,11 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 .calendar_calBirthday a {
   color: #626161;
 }
+/* Supress tooltips on holidays shown as events */
+.calendar_calEventTooltip.calendar_calBirthday,
+.calendar_calEventTooltip.calendar_calHoliday {
+  display: none;
+}
 /* timeGridWidget, contains timeRow's and dayCol's
  */
 .calendar_calTimeGrid {
@@ -1148,6 +1153,7 @@ Hide subsequent headers in week view with non-consolidated owners
 .calendar_eventRowsFiller {
   position: absolute;
   top: 0px;
+  right: 0px;
   height: 93%;
   background-color: white;
   border: 1px dashed gray;
@@ -1419,6 +1425,10 @@ input#calendar-edit_location {
   background-image: linear-gradient(top, #828282, #828282) !important;
   background-repeat: repeat-x !important;
 }
+#calendar-list {
+  /* Keeps the scrollbar in the window in chrome */
+  margin-right: 10px;
+}
 #calendar_sidebox_content .egw_fw_ui_category_content {
   padding-left: 0px !important;
 }
@@ -2587,6 +2597,10 @@ div#calendar-container div.calendar table tbody tr.rowhilite td {
 }
 #calendar-sidebox_date .ui-datepicker-year {
   padding-right: 5px !important;
+  min-width: 65px;
+}
+#calendar-sidebox_date .ui-datepicker-month {
+  min-width: 60px;
 }
 #calendar-sidebox_date .ui-datepicker-header a span {
   width: 20px;
diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css
index 234aee15d8..e2cf695311 100755
--- a/calendar/templates/pixelegg/app.css
+++ b/calendar/templates/pixelegg/app.css
@@ -249,6 +249,11 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 .calendar_calBirthday a {
   color: #626161;
 }
+/* Supress tooltips on holidays shown as events */
+.calendar_calEventTooltip.calendar_calBirthday,
+.calendar_calEventTooltip.calendar_calHoliday {
+  display: none;
+}
 /* timeGridWidget, contains timeRow's and dayCol's
  */
 .calendar_calTimeGrid {