From c146da810620022ac31fe63edd1b03fcdb99eb94 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Fri, 15 Jan 2016 20:51:12 +0000
Subject: [PATCH] Fix planner view sizing issue where row headers overlapped
 row data when planner was not wide enough

---
 calendar/js/et2_widget_planner.js    | 2 ++
 calendar/templates/default/app.css   | 9 +++------
 calendar/templates/pixelegg/app.css  | 8 --------
 calendar/templates/pixelegg/app.less | 7 -------
 4 files changed, 5 insertions(+), 21 deletions(-)

diff --git a/calendar/js/et2_widget_planner.js b/calendar/js/et2_widget_planner.js
index ade21ce61c..70ab202356 100644
--- a/calendar/js/et2_widget_planner.js
+++ b/calendar/js/et2_widget_planner.js
@@ -1868,6 +1868,8 @@ var et2_calendar_planner = et2_calendar_view.extend([et2_IDetachedDOM, et2_IResi
 		
 		this.options.height = height;
 		this.div.css('height', this.options.height);
+		// Set height for rows
+		this.rows.height(this.div.height() - this.headers.outerHeight());
 	}
 });
 et2_register_widget(et2_calendar_planner, ["calendar-planner"]);
\ No newline at end of file
diff --git a/calendar/templates/default/app.css b/calendar/templates/default/app.css
index 5d16cc2d99..7e14232ee1 100644
--- a/calendar/templates/default/app.css
+++ b/calendar/templates/default/app.css
@@ -858,7 +858,6 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 	padding-right: 2px;
 }
 .calendar_plannerRowHeader:hover {
-	width: initial !important;
 	overflow:visible;
 	z-index: 30;
 	cursor: pointer;
@@ -869,14 +868,12 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 .calendar_eventRows, .calendar_plannerHeaderRows {
 	position: relative;
 	top: 0px;
-	left: 15%;	/* need to be identical for calendar_eventRows and calendar_plannerHeaderRows and match width of calendar_plannerRowHeader/calendar_plannerHeaderTitle */
-	width: 85%;
+	left: 0px;
+	right: 0px;
+	margin-left: 172px;/* need to be identical for calendar_eventRows and calendar_plannerHeaderRows and match width of calendar_plannerRowHeader/calendar_plannerHeaderTitle */
 	min-height: 20px;
 	height: 100%;
 }
-.calendar_eventRows {
-	margin-left: 2px;
-}
 .calendar_plannerWidget .verticalBar {
 	width: 8ex;
     height: 100%;
diff --git a/calendar/templates/pixelegg/app.css b/calendar/templates/pixelegg/app.css
index 7ab3a02ea9..60cc31178c 100755
--- a/calendar/templates/pixelegg/app.css
+++ b/calendar/templates/pixelegg/app.css
@@ -1059,14 +1059,6 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
 .calendar_plannerHeaderTitle {
   line-height: 20px;
 }
-/* calendar_eventRows contain multiple eventRowWidgets
- */
-.calendar_eventRows,
-.calendar_plannerHeaderRows {
-  left: 15%;
-  /* need to be identical for calendar_eventRows and calendar_plannerHeaderRows and match width of calendar_plannerRowHeader/calendar_plannerHeaderTitle */
-  width: 85%;
-}
 /**
  * Filler for month with less then 31 days in yearly planner
  */
diff --git a/calendar/templates/pixelegg/app.less b/calendar/templates/pixelegg/app.less
index 40da1fac55..836536ad85 100755
--- a/calendar/templates/pixelegg/app.less
+++ b/calendar/templates/pixelegg/app.less
@@ -1133,13 +1133,6 @@ e.g. the div with class calendar_calTimeGrid is generated by the timeGridWidget
     line-height: 20px;
 }
 
-/* calendar_eventRows contain multiple eventRowWidgets
- */
-.calendar_eventRows, .calendar_plannerHeaderRows {
-    left: 15%;	/* need to be identical for calendar_eventRows and calendar_plannerHeaderRows and match width of calendar_plannerRowHeader/calendar_plannerHeaderTitle */
-    width: 85%;
-}
-
 /**
  * Filler for month with less then 31 days in yearly planner
  */