From 5836cfb076b1c68eb8b381a98fb1f355f9e60ad1 Mon Sep 17 00:00:00 2001
From: Hadi Nategh <hn@stylite.de>
Date: Wed, 7 Oct 2015 08:45:32 +0000
Subject: [PATCH] Bind the y-overflow and calculate the event column height if
 no fixed time-grid is set

---
 calendar/inc/class.calendar_uiviews.inc.php | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/calendar/inc/class.calendar_uiviews.inc.php b/calendar/inc/class.calendar_uiviews.inc.php
index 3d25346228..089b81c042 100644
--- a/calendar/inc/class.calendar_uiviews.inc.php
+++ b/calendar/inc/class.calendar_uiviews.inc.php
@@ -1374,9 +1374,9 @@ class calendar_uiviews extends calendar_ui
 	function dayColWidget($day_ymd,$events,$pleft,$pwidth,$indent,$short_title=True,$on_off=False,$owner=0)
 	{
 		if ($this->debug > 1 || $this->debug==='dayColWidget') $this->bo->debug_message('uiviews::dayColWidget(%1,%2,left=%3,width=%4,)',False,$day_ymd,$events,$pleft,$pwidth);
-		$time_grid_overflow = !$this->use_time_grid?'overflow-y:auto;overflow-x:hidden;':'';
+		
 		$html = $indent.'<div id="calColumn'.$this->calColumnCounter++.'" class="calendar_calDayCol" '.'data-sortable-id="'.$owner.'" style="left: '.$pleft.
-			'%;width: '.$pwidth.'%;'.$time_grid_overflow.'">'."\n";
+			'%;width: '.$pwidth.'%;">'."\n";
 
 		// Creation of the header-column with date, evtl. holiday-names and a matching background-color
 		$ts = $this->bo->date2ts((string)$day_ymd);
@@ -1453,7 +1453,7 @@ class calendar_uiviews extends calendar_ui
 
 				$droppableDateTime = $linkData['date'] . "T" . $linkData['hour'] . $linkData['minute'];
 				$droppableID='drop_'.$droppableDateTime.'_O'.($owner<0?str_replace('-','group',$owner):$owner);
-
+				
 				$html .= $indent."\t".'<div id="' . $droppableID . '" style="height:'. $this->rowHeight .'%; top: '. $i*$this->rowHeight .
 					'%;" class="calendar_calAddEvent"';
 				if ($this->allowEdit)
@@ -1591,7 +1591,7 @@ class calendar_uiviews extends calendar_ui
 			// regions are not clickable anymore. The z_index has now moved the the eventWidget
 			// function.
 			//(!is_null($z_index) ? ' z-index:'.$z_index.';' : '').
-			(!$this->use_time_grid ? ' top: '.$this->rowHeight.'%;' : '').'">'."\n";
+			(!$this->use_time_grid ? ' top: '.$this->rowHeight.'%;height: '.(100 - $this->rowHeight).'%;overflow-y:auto;' : '').'">'."\n";
 		foreach($events as $event)
 		{
 			$html .= $this->eventWidget($event,$width,$indent."\t",$owner,false,'event_widget',$z_index);