Pass two at Day view, added event loop and better CSS.

3 files changed, 62 insertions, 48 deletions

diff --git a/functions/template.php b/functions/template.php
index d2daac9..313a78a 100644
--- a/functions/template.php
+++ b/functions/template.php
@@ -191,7 +191,9 @@ class Page {
 			} 
 		}
 		preg_match("!<\!-- loop row on -->(.*)<\!-- loop row off -->!is", $this->page, $match2);
+		preg_match("!<\!-- loop event on -->(.*)<\!-- loop event off -->!is", $this->page, $match3);
 		$loop_hours = trim($match2[1]);
+		$loop_event = trim($match3[1]);
 
 		$event_length = array ();
 		$border = 0;
@@ -264,7 +266,7 @@ class Page {
 				$dayborder = 0;
 			}
 			if (sizeof($event_length) == 0) {
-				$daydisplay .= '<td bgcolor="#ffffff" colspan="' . $nbrGridCols . '" '.$class.'>&nbsp;</td>'."\n";
+				$daydisplay .= '<td colspan="' . $nbrGridCols . '" '.$class.'>&nbsp;</td>'."\n";
 				
 			} else {
 				$emptyWidth = $nbrGridCols;
@@ -283,36 +285,30 @@ class Page {
 						  $event_status = strtolower($this_time_arr[($event_length[$i]['key'])]['status']);
 						  if ($event_calno < 1) $event_calno = 1;
 						  if ($event_calno > 7) $event_calno = 7;
-		
-						  $daydisplay .= '<td rowspan="' . $event_length[$i]['length'] . '" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2_'.$event_calno.'">'."\n";
-						  $daydisplay .= '<table width="100%" border="0" cellspacing="0" cellpadding="2">'."\n";
-						  $daydisplay .= '<tr>'."\n";
-						  $daydisplay .= '<td class="eventbg_'.$event_calno.'"><font class="eventfont"><b>'.$event_start.'</b> - '.$event_end.'</font></td>'."\n";
 						  if ($event_status != '') {
-							$daydisplay .= '<td class="eventbg_'.$event_calno.'" width="9" align="right" valign="center"><font class="eventfont">';
-							$daydisplay .= '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0">';
-							$daydisplay .= '</font></td>'."\n";
+						  	$confirmed = '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0">&nbsp;';
 						  }
-						  $daydisplay .= '</tr>'."\n";
-						  $daydisplay .= '<tr>'."\n";
-						  $daydisplay .= '<td colspan="2">'."\n";
-						  $daydisplay .= '<table width="100%" border="0" cellpadding="1" cellspacing="0">'."\n";
-						  $daydisplay .= '<tr>'."\n";
-						  $daydisplay .= '<td>';
+						  
+						  $daydisplay .= '<td rowspan="' . $event_length[$i]['length'] . '" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2_'.$event_calno.'">'."\n";
+						  
+						  // Start drawing the event
+						  $event_temp  = $loop_event;
 						  $event_calna = $this_time_arr[($event_length[$i]['key'])]['calname'];
 						  $event_url   = $this_time_arr[($event_length[$i]['key'])]['url'];
-						  $daydisplay .= openevent($event_calna, $event_start, $event_end, $this_time_arr[($event_length[$i]['key'])], '', 0, '<font class="eventfont">', '</font>', 'psf', $event_url);
-						  $daydisplay .= '</td></tr>'."\n";
-						  $daydisplay .= '</table>'."\n";
-						  $daydisplay .= '</td>'."\n";           
-						  $daydisplay .= '</tr>'."\n";
-						  $daydisplay .= '</table>'."\n";
-						  $daydisplay .= '</td>'."\n";
+						  $event 	   = openevent($event_calna, $event_start, $event_end, $this_time_arr[($event_length[$i]['key'])], '', 0, '', '', 'ps', $event_url);
+						  $event_temp   = str_replace('{EVENT}', $event, $event_temp);
+						  $event_temp   = str_replace('{EVENT_START}', $event_start, $event_temp);
+						  $event_temp   = str_replace('{EVENT_END}', $event_end, $event_temp);
+						  $event_temp   = str_replace('{CONFIRMED}', $confirmed, $event_temp);
+						  $event_temp   = str_replace('{EVENT_CALNO}', $event_calno, $event_temp);
+						  $daydisplay .= $event_temp;
+						  // End event drawing
+						  
 						  break;
 						case 'started':
 							break;
 						case 'ended':
-							$daydisplay .= '<td bgcolor="#ffffff" colspan="' . $drawWidth . '" ' . $class . '>&nbsp;</td>'."\n";
+							$daydisplay .= '<td colspan="' . $drawWidth . '" ' . $class . '>&nbsp;</td>'."\n";
 							break;
 					}
 					$event_length[$i]['length']--;
@@ -322,7 +318,7 @@ class Page {
 				}
 				//fill emtpy space on the right
 				if ($emptyWidth > 0) {
-					$daydisplay .= '<td bgcolor="#ffffff" colspan="' . $emptyWidth . '" ' . $class . '>&nbsp;</td>'."\n";
+					$daydisplay .= '<td colspan="' . $emptyWidth . '" ' . $class . '>&nbsp;</td>'."\n";
 				}
 				while (isset($event_length[(sizeof($event_length) - 1)]) && $event_length[(sizeof($event_length) - 1)]['state'] == 'ended') {
 					array_pop($event_length);
@@ -332,7 +328,7 @@ class Page {
 			$daydisplay .= '</tr>'."\n";
 		}
 		
-		$this->page = preg_replace('!<\!-- loop row on -->(.*)<\!-- loop row off -->!is', $daydisplay, $this->page);
+		$this->page = preg_replace('!<\!-- loop row on -->(.*)<\!-- loop event off -->!is', $daydisplay, $this->page);
 	
 	
 	}
diff --git a/templates/default/day.tpl b/templates/default/day.tpl
index 80a3032..93de419 100644
--- a/templates/default/day.tpl
+++ b/templates/default/day.tpl
@@ -75,6 +75,12 @@
 								<td class="dayborder2">&nbsp;</td>
 							</tr>
 							<!-- loop row off -->
+							<!-- loop event on -->
+							<div class="eventfont">
+								<div class="eventbg_{EVENT_CALNO}">{CONFIRMED}<b>{EVENT_START}</b> - {EVENT_END}</div>
+								<div class="padd">{EVENT}</div>
+							</div>
+							<!-- loop event off -->
 						</table>
 					</td>
 				</tr>
diff --git a/templates/default/default.css b/templates/default/default.css
index 820dfcb..582f919 100644
--- a/templates/default/default.css
+++ b/templates/default/default.css
@@ -21,6 +21,27 @@ table, td {font: 11px Verdana, Arial, sans-serif; color: #000;}
 .rowOff2		{ background-color: #E1E8F1; border-top: 1px solid #fff; border-left: }

 .rowToday		{ background-color: #cff; border-top: 1px solid #fff; border-left: 1px solid #fff; }

 

+.padd			{ padding: 2px; }

+

+/* Styles for day and week events */

+.eventbg_1	 	{ background-color: #557CA3; padding: 2px;}

+.eventbg_2	 	{ background-color: #53A062; padding: 2px;}

+.eventbg_3	 	{ background-color: #E84F25; padding: 2px;}

+.eventbg_4	 	{ background-color: #B257A2; padding: 2px;}

+.eventbg_5	 	{ background-color: #D42020; padding: 2px;}

+.eventbg_6	 	{ background-color: #CCB21F; padding: 2px;}

+.eventbg_7	 	{ background-color: #73738C; padding: 2px;}

+

+.eventbg2_1	 		{ background-color: #6699CC; border: 1px solid #557CA3; }

+.eventbg2_2	 		{ background-color: #4FC464; border: 1px solid #53A062; }

+.eventbg2_3	 		{ background-color: #FF6D3B; border: 1px solid #E84F25; }

+.eventbg2_4	 		{ background-color: #EA62D4; border: 1px solid #B257A2; }

+.eventbg2_5	 		{ background-color: #FF5E56; border: 1px solid #D42020; }

+.eventbg2_6	 		{ background-color: #FFEB4A; border: 1px solid #CCB21F; }

+.eventbg2_7	 		{ background-color: #73738C; border: 1px solid #73738C; }

+

+.dayborder 		{ background-color: #fff; border-top: 1px solid #A1A5A9; }

+.dayborder2 	{ background-color: #fff; border-top: 1px dashed #ccc; }

 

 

 /* older styles */

@@ -28,23 +49,9 @@ table, td {font: 11px Verdana, Arial, sans-serif; color: #000;}
 .eventborder	{ background-image: url(images/day_title.gif); border: 1px #006699 solid; }

 .eventbg	 	{ background-color: #6699CC; }

 

-.eventbg_1	 		{ background-color: #557CA3; }

-.eventbg_2	 		{ background-color: #53A062; }

-.eventbg_3	 		{ background-color: #E84F25; }

-.eventbg_4	 		{ background-color: #B257A2; }

-.eventbg_5	 		{ background-color: #D42020; }

-.eventbg_6	 		{ background-color: #CCB21F; }

-.eventbg_7	 		{ background-color: #73738C; }

 

-.eventbg2 	 	{ background-color: #6699CC; border-right: 1px solid #fff; }

+/*.eventbg2 	 	{ background-color: #6699CC; border-right: 1px solid #fff; }*/

 

-.eventbg2_1	 		{ background-color: #6699CC; border-right: 1px solid #fff; }

-.eventbg2_2	 		{ background-color: #4FC464; border-right: 1px solid #fff; }

-.eventbg2_3	 		{ background-color: #FF6D3B; border-right: 1px solid #fff; }

-.eventbg2_4	 		{ background-color: #EA62D4; border-right: 1px solid #fff; }

-.eventbg2_5	 		{ background-color: #FF5E56; border-right: 1px solid #fff; }

-.eventbg2_6	 		{ background-color: #FFEB4A; border-right: 1px solid #fff; }

-.eventbg2_7	 		{ background-color: #73738C; border-right: 1px solid #fff; }

 

 .eventbg2week 	{ background-color: #6699CC; border-right: 1px solid #A1A5A9; }

 

@@ -56,10 +63,8 @@ table, td {font: 11px Verdana, Arial, sans-serif; color: #000;}
 .eventbg2week_6	 	{ background-color: #6876E7; border-right: 1px solid #A1A5A9; }

 .eventbg2week_7	 	{ background-color: #73738C; border-right: 1px solid #A1A5A9; }

 

-.calborder 		{ background-color: #FFFFFF; border: 1px #A1A5A9 solid; }

-.dateback		{ background-color: #EEEEEE; }

-.dayborder 		{ border-top: 1px solid #A1A5A9; }

-.dayborder2 	{ border-top: 1px dashed #CCCCCC; }

+.calborder 		{ background-color: #fff; border: 1px #A1A5A9 solid; }

+.dateback		{ background-color: #eee; }

 .weekborder 	{ border-top: 1px dashed #A1A5A9; border-right: 1px solid #A1A5A9; }

 .weekborder2 	{ border-right: 1px solid #A1A5A9; }

 .timeborder 	{ border-right: 2px solid #A1A5A9; border-top: 1px dashed #A1A5A9; background-image: url(images/time_bg.gif); }

@@ -91,10 +96,17 @@ a.ps2:hover		{ color: #000099; background-color: transparent; }
 

 /* This is the link style for year months */	

 a.ps3			{ text-decoration:	none; }

-a.ps3:link		{ color: #000000; background-color: transparent; }

-a.ps3:visited	{ color: #000000; background-color: transparent; }

-a.ps3:active	{ color: #000000; background-color: transparent; }

-a.ps3:hover		{ color: #000000; background-color: transparent; }

+a.ps3:link		{ color: #000; background-color: transparent; }

+a.ps3:visited	{ color: #000; background-color: transparent; }

+a.ps3:active	{ color: #000; background-color: transparent; }

+a.ps3:hover		{ color: #000; background-color: transparent; }

+

+/* This is the link style for events */	

+a.ps			{ text-decoration:	none; }

+a.ps:link		{ color: #fff; background-color: transparent; }

+a.ps:visited	{ color: #fff; background-color: transparent; }

+a.ps:active		{ color: #fff; background-color: transparent; }

+a.ps:hover		{ color: #fff; text-decoration: underline; }

 	

 /* Body attributes */