From 6f07b8384fcd101ab5b0523ac3e43d542c137875 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Thu, 31 Mar 2016 22:32:13 +0000
Subject: [PATCH] Fix some issues with calendar owner name - contacts would
 sometimes show week name and contact name - Long owner names for first week
 would overflow onto the times

---
 calendar/js/et2_widget_timegrid.js  |  1 +
 calendar/templates/default/app.css  |  7 +++++--
 calendar/templates/pixelegg/app.css | 11 +++++++----
 3 files changed, 13 insertions(+), 6 deletions(-)

diff --git a/calendar/js/et2_widget_timegrid.js b/calendar/js/et2_widget_timegrid.js
index 9b8d1f3970..1b6c18779e 100644
--- a/calendar/js/et2_widget_timegrid.js
+++ b/calendar/js/et2_widget_timegrid.js
@@ -1403,6 +1403,7 @@ var et2_calendar_timegrid = (function(){ "use strict"; return et2_calendar_view.
 
 		if(typeof _owner == 'string' && isNaN(_owner))
 		{
+			this.set_label('');
 			switch(_owner[0])
 			{
 				case 'c':
diff --git a/calendar/templates/default/app.css b/calendar/templates/default/app.css
index 1ba29e8991..da7b255576 100644
--- a/calendar/templates/default/app.css
+++ b/calendar/templates/default/app.css
@@ -283,13 +283,16 @@ Hide subsequent headers in week view with non-consolidated owners
 #calendar-view_view.hideDayColHeader tr:not(:first-of-type) .calendar_calGridHeader .calendar_calDayColHeader > div[data-date] {
 	display:none;
 }
-#calendar-view_view.hideDayColHeader tr:not(:first-of-type) .calendar_calGridHeader  > ul > li {
+#calendar-view_view.hideDayColHeader tr .calendar_calGridHeader  > ul > li {
 	white-space:nowrap;
 	text-overflow: ellipsis;
 	overflow: hidden;
 }
-#calendar-view_view.hideDayColHeader tr:not(:first-of-type) .calendar_calGridHeader  > ul > li:hover {
+#calendar-view_view.hideDayColHeader tr .calendar_calGridHeader  > ul:hover {
 	overflow: visible;
+    width: auto;
+	background-color: inherit;
+    z-index: 100;
 }
 
 /* single row in the time-line you dont need to set a bgcolor, but you can
diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css
index b8d2a5646b..f2187daa2b 100755
--- a/calendar/templates/pixelegg/app.css
+++ b/calendar/templates/pixelegg/app.css
@@ -11,7 +11,7 @@
  * @package calendar
  * @version $Id$
  */
-/* $Id: app.css 55492 2016-03-22 15:09:39Z nathangray $ */
+/* $Id: app.css 55586 2016-03-31 21:55:47Z nathangray $ */
 /*Media print classes*/
 @media print {
   #calendar-view.et2_container,
@@ -38,7 +38,7 @@
     page-break-inside: avoid;
   }
   .calendar_calTimeGrid .calendar_calTimeGridScroll {
-    overflow-y: hidden;
+    overflow-y: hidden !important;
   }
   /* Let hidden user names be visible */
   #calendar-view_view.hideDayColHeader tr:not(:first-of-type) .calendar_calGridHeader > ul {
@@ -292,13 +292,16 @@ Hide subsequent headers in week view with non-consolidated owners
 #calendar-view_view.hideDayColHeader tr:not(:first-of-type) .calendar_calGridHeader .calendar_calDayColHeader > div[data-date] {
   display: none;
 }
-#calendar-view_view.hideDayColHeader tr:not(:first-of-type) .calendar_calGridHeader > ul > li {
+#calendar-view_view.hideDayColHeader tr .calendar_calGridHeader > ul > li {
   white-space: nowrap;
   text-overflow: ellipsis;
   overflow: hidden;
 }
-#calendar-view_view.hideDayColHeader tr:not(:first-of-type) .calendar_calGridHeader > ul > li:hover {
+#calendar-view_view.hideDayColHeader tr .calendar_calGridHeader > ul:hover {
   overflow: visible;
+  width: auto;
+  background-color: inherit;
+  z-index: 100;
 }
 /* single row in the time-line you dont need to set a bgcolor, but you can
  */