Placed print template in place, started wiring print.php

7 files changed, 161 insertions, 191 deletions

diff --git a/day.php b/day.php
index c3fdfc5..31e1d1c 100644
--- a/day.php
+++ b/day.php
@@ -44,6 +44,7 @@ $page->replace_tags(array(
 	'cal'				=> $cal,
 	'getdate'			=> $getdate,
 	'calendar_name'		=> $calendar_name,
+	'current_view'		=> $current_view,
 	'display_date'		=> $display_date,
 	'sidebar_date'		=> $sidebar_date,
 	'rss_powered'	 	=> $rss_powered,
diff --git a/functions/template.php b/functions/template.php
index b95156c..882ecf9 100644
--- a/functions/template.php
+++ b/functions/template.php
@@ -4,6 +4,53 @@
 
 class Page {
 	var $page;
+	function draw_print($template_p) {
+		global $template, $getdate, $cal, $master_array, $daysofweek_lang, $week_start_day;
+		foreach($master_array as $key => $val) {
+			ereg ("([0-9]{6})([0-9]{2})", $key, $regs);
+			if ((($regs[1] == $parse_month) && ($printview == "month")) || (($key == $getdate) && ($printview == "day")) || ((($key >= $week_start) && ($key <= $week_end)) && ($printview == "week"))) {
+				$events_week++;
+				$dayofmonth = strtotime ($key);
+				$dayofmonth = localizeDate ($dateFormat_day, $dayofmonth);
+				echo "<tr><td width=\"10\"><img src=\"images/spacer.gif\" width=\"10\" height=\"1\" alt=\" \"></td>\n";
+				echo "<td align=\"left\" colspan=\"2\"><font class=\"V12\"><b>$dayofmonth</b></font></td></tr>";
+				echo "<tr><td colspan=\"3\"><img src=\"images/spacer.gif\" width=\"1\" height=\"5\" alt=\" \"></td></tr>\n";
+				
+				// Pull out each day
+				foreach ($val as $new_val) {
+					foreach ($new_val as $new_key2 => $new_val2) {
+					if ($new_val2["event_text"]) {	
+						$event_text 	= stripslashes(urldecode($new_val2["event_text"]));
+						$description 	= stripslashes(urldecode($new_val2["description"]));
+						$event_start 	= $new_val2["event_start"];
+						$event_end 		= $new_val2["event_end"];
+						if (isset($new_val2["display_end"])) $event_end = $new_val2["display_end"];
+						$event_start 	= date ($timeFormat, strtotime ("$event_start"));
+						$event_end 		= date ($timeFormat, strtotime ("$event_end"));
+						$event_start 	= "$event_start - $event_end";
+						if (!$new_val2["event_start"]) { 
+							$event_start = "$all_day_lang";
+							$event_start2 = '';
+							$event_end = '';
+						}
+						
+						$middle = '';
+						
+						if ($new_val2["description"]) {
+							$middle = '';
+						}
+							$middle = '';		
+						}
+					}
+				}
+			}
+		}
+		
+		if ($events_week < 1) {
+			$middle = $no_events;
+		}	
+	}	
+	
 	function draw_day($template_p) {
 		global $template, $getdate, $cal, $master_array, $daysofweek_lang, $week_start_day;
 		
diff --git a/print.php b/print.php
index 56e50b6..f08c89e 100644
--- a/print.php
+++ b/print.php
@@ -1,7 +1,9 @@
 <?php
 	
 define('BASE', './');
-include(BASE.'functions/ical_parser.php');
+require_once(BASE.'functions/ical_parser.php');
+require_once(BASE.'functions/list_functions.php');
+require_once(BASE.'functions/template.php');
 $cal_displayname2 = $calendar_name . " $calendar_lang";
 if (strlen($cal_displayname2) > 24) {
 	$cal_displayname2 = substr("$cal_displayname2", 0, 21);
@@ -47,125 +49,42 @@ if ($printview == 'day') {
 	$week_end		= '';
 }
 
-include (BASE.'includes/header.inc.php'); 
+$page = new Page(BASE.'templates/'.$template.'/print.tpl');
+
+$page->replace_tags(array(
+	'header'			=> BASE.'templates/'.$template.'/header.tpl',
+	'footer'			=> BASE.'templates/'.$template.'/footer.tpl',
+	'sidebar'			=> BASE.'templates/'.$template.'/sidebar.tpl',
+	'event_js'			=> BASE.'functions/event.js',
+	'template'			=> $template,
+	'cal'				=> $cal,
+	'getdate'			=> $getdate,
+	'calendar_name'		=> $calendar_name,
+	'current_view'		=> $current_view,
+	'display_date'		=> $display_date,
+	'sidebar_date'		=> $sidebar_date,
+	'rss_powered'	 	=> $rss_powered,
+	'rss_available' 	=> '',
+	'rss_valid' 		=> '',
+	'todo_js' 			=> '',
+	'show_search' 		=> '',
+	'next_day' 			=> $next_day,
+	'prev_day'	 		=> $prev_day,
+	'show_goto' 		=> '',
+	'is_logged_in' 		=> '',
+	'list_icals' 		=> $list_icals,
+	'list_years' 		=> $list_years,
+	'list_months' 		=> $list_months,
+	'list_weeks' 		=> $list_weeks,
+	'list_jumps' 		=> $list_jumps,
+	'legend'	 		=> $list_calcolors,
+	'style_select' 		=> $style_select			
+	));
+	
+$page->draw_day($this->page);
+$page->tomorrows_events($this->page);
+$page->get_vtodo($this->page);
+
+$page->output();
 
 ?>
-<center>
-<table border="0" width="700" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF" class="calborder">
-	<tr>
-		<td>
-			<table width="100%" border="0" cellspacing="0" cellpadding="0">
-      			<tr>
-      				<td align="left" width="90" class="navback"><?php echo '<a href="'.$printview.'.php?cal='.$cal.'&amp;getdate='.$getdate.'"><img src="styles/'.$style_sheet.'/back.gif" alt="['.$back_lang.']" border="0" align="left"></a>'; ?></td>
-      				<td class="navback">
-      					<table width="100%" border="0" cellspacing="0" cellpadding="0">
-      						<tr>
-								<td align="right" width="40%" class="navback"><?php echo "<a class=\"psf\" href=\"print.php?cal=$cal&amp;getdate=$prev&amp;printview=$printview\"><img src=\"styles/$style_sheet/left_day.gif\" alt=\"[$print_prev_nav]\" border=\"0\" align=\"right\"></a>"; ?></td>
-								<td align="center" width="20%" class="navback" nowrap valign="middle"><font class="H20"><?php echo $display_date; ?></font></td>
-      							<td align="left" width="40%" class="navback"><?php echo "<a class=\"psf\" href=\"print.php?cal=$cal&amp;getdate=$next&amp;printview=$printview\"><img src=\"styles/$style_sheet/right_day.gif\" alt=\"[$print_next_nav]\" border=\"0\" align=\"left\"></a>"; ?></td>
-      						</tr>
-      					</table>
-      				</td>
-      				<td align="right" width="90" class="navback">	
-      					<table width="90" border="0" cellpadding="0" cellspacing="0">
-							<tr>
-								<td><?php echo '<a class="psf" href="print.php?cal='.$cal.'&amp;getdate='.$getdate.'&amp;printview=day"><img src="styles/'.$style_sheet.'/day_on.gif" alt="'.$day_lang.' View" border="0"></a></td>'; ?>
-								<td><?php echo '<a class="psf" href="print.php?cal='.$cal.'&amp;getdate='.$getdate.'&amp;printview=week"><img src="styles/'.$style_sheet.'/week_on.gif" alt="'.$week_lang.' View" border="0"></a></td>'; ?>
-								<td><?php echo '<a class="psf" href="print.php?cal='.$cal.'&amp;getdate='.$getdate.'&amp;printview=month"><img src="styles/'.$style_sheet.'/month_on.gif" alt="'.$month_lang.' View" border="0"></a></td>'; ?>
-							</tr>
-						</table>
-					</td>
-      			</tr>
-      		</table>
-      	</td>
-    </tr>
-	<tr>
-		<td colspan="3" class="dayborder"><img src="images/spacer.gif" width="1" height="5" alt=" "></td>
-	</tr>
-	<tr>
-		<td colspan="3">
-				<table border="0" cellspacing="0" cellpadding="0" width="100%">
-					<tr>
-						<td align="center" valign="top">
-							<table width="100%" border="0" cellspacing="0" cellpadding="0">
-								<tr>
-									<td colspan="3" height="1"></td>
-								</tr>
-								<?php	
-									// Iterate the entire master array
-									foreach($master_array as $key => $val) {
-										
-										// Pull out only this months
-										ereg ("([0-9]{6})([0-9]{2})", $key, $regs);
-										if ((($regs[1] == $parse_month) && ($printview == "month")) || (($key == $getdate) && ($printview == "day")) || ((($key >= $week_start) && ($key <= $week_end)) && ($printview == "week"))) {
-											$events_week++;
-											$dayofmonth = strtotime ($key);
-											$dayofmonth = localizeDate ($dateFormat_day, $dayofmonth);
-											echo "<tr><td width=\"10\"><img src=\"images/spacer.gif\" width=\"10\" height=\"1\" alt=\" \"></td>\n";
-											echo "<td align=\"left\" colspan=\"2\"><font class=\"V12\"><b>$dayofmonth</b></font></td></tr>";
-											echo "<tr><td colspan=\"3\"><img src=\"images/spacer.gif\" width=\"1\" height=\"5\" alt=\" \"></td></tr>\n";
-											
-											// Pull out each day
-											foreach ($val as $new_val) {
-												
-												// Pull out each time
-												foreach ($new_val as $new_key2 => $new_val2) {
-												if ($new_val2["event_text"]) {	
-													$event_text 	= stripslashes(urldecode($new_val2["event_text"]));
-													$description 	= stripslashes(urldecode($new_val2["description"]));
-													$event_start 	= $new_val2["event_start"];
-													$event_end 		= $new_val2["event_end"];
-													if (isset($new_val2["display_end"])) $event_end = $new_val2["display_end"];
-													$event_start 	= date ($timeFormat, strtotime ("$event_start"));
-													$event_end 		= date ($timeFormat, strtotime ("$event_end"));
-													$event_start 	= "$event_start - $event_end";
-													if (!$new_val2["event_start"]) { 
-														$event_start = "$all_day_lang";
-														$event_start2 = '';
-														$event_end = '';
-													}
-													echo "<tr>\n";
-													echo "<td width=\"10\"><img src=\"images/spacer.gif\" width=\"10\" height=\"1\" alt=\" \"></td>\n";
-													echo "<td width=\"10\"><img src=\"images/spacer.gif\" width=\"10\" height=\"1\" alt=\" \"></td>\n";
-													echo "<td align=\"left\">\n";
-													echo "<table width=\"100%\" border=\"0\" cellspacing=\"1\" cellpadding=\"1\">\n";
-													echo "<tr>\n";
-													echo "<td width=\"100\" class=\"G10BOLD\">$time_lang:</td>\n";
-													echo "<td align=\"left\" class=\"G10B\">$event_start</td>\n";
-													echo "</tr>\n";
-													echo "<tr>\n";
-													echo "<td valign=\"top\" width=\"100\" class=\"G10BOLD\">$summary_lang:</td>\n";
-													echo "<td valign=\"top\" align=\"left\" class=\"G10B\">$event_text</td>\n";
-													echo "</tr>\n";
-													if ($new_val2["description"]) {
-														echo "<tr>\n";
-														echo "<td valign=\"top\" width=\"100\" class=\"G10BOLD\">$description_lang:</td>\n";
-														echo "<td valign=\"top\" align=\"left\" class=\"G10B\">$description</td>\n";
-														echo "</tr>\n";
-													}
-													echo "</table>\n";
-													echo "</td>\n";
-													echo "</tr>\n";			
-													echo "<tr><td colspan=\"3\"><img src=\"images/spacer.gif\" width=\"1\" height=\"10\" alt=\" \"></td></tr>\n";
-													}
-												}
-											}
-										}
-									}
-									
-									if ($events_week < 1) {
-										echo "<tr><td width=\"10\"><img src=\"images/spacer.gif\" width=\"10\" height=\"1\" alt=\" \"></td>\n";
-										echo "<td align=\"left\" colspan=\"2\"><font class=\"V12\"><br><center><b>$zero_events</b></center></font><br></td></tr>";
-										echo "<tr><td colspan=\"3\"><img src=\"images/spacer.gif\" width=\"1\" height=\"5\" alt=\" \"></td></tr>\n";
-									}
-								
-								?>
-						</table>
-					</td>
-				</tr>
-			</table>		
-		</td>
-	</tr>
-</table>
-</center>
-<?php include (BASE.'includes/footer.inc.php'); ?>
diff --git a/templates/default/preferences.tpl b/templates/default/preferences.tpl
index 8a33993..83625e5 100644
--- a/templates/default/preferences.tpl
+++ b/templates/default/preferences.tpl
@@ -96,6 +96,13 @@
 		</td>
 	</tr>
 </table>
+<table width="650" border="0" cellpadding="0" cellspacing="0">
+	<tr>
+		<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
+		<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
+		<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
+	</tr>
+</table>
 
 </center>
 {FOOTER}
diff --git a/templates/default/print.tpl b/templates/default/print.tpl
index bb09766..f35cb90 100644
--- a/templates/default/print.tpl
+++ b/templates/default/print.tpl
@@ -1,30 +1,24 @@
+{HEADER}
 <center>
-<table border="0" width="700" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF" class="calborder">
+<table border="0" width="650" cellspacing="0" cellpadding="0" class="calborder">
 	<tr>
 		<td>
 			<table width="100%" border="0" cellspacing="0" cellpadding="0">
-      			<tr>
-      				<td align="left" width="90" class="navback"><a href="{PRINTVIEW}.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/back.gif" alt="{L_BACK}" border="0" align="left"></a>'; ?></td>
-      				<td class="navback">
-      					<table width="100%" border="0" cellspacing="0" cellpadding="0">
-      						<tr>
-								<td align="right" width="40%" class="navback"><a class="psf" href="print.php?cal={CAL}&amp;getdate={PREV}&amp;printview={PRINTVIEW}"><img src="templates/{TEMPLATE}/images/left_day.gif" alt="{L_PREV}" border="0" align="right"></a></td>
-								<td align="center" width="20%" class="navback" nowrap valign="middle"><font class="H20">{display_date}</font></td>
-      							<td align="left" width="40%" class="navback"><a class="psf" href="print.php?cal={CAL}&amp;getdate={NEXT}&amp;printview={PRINTVIEW}"><img src="templates/{TEMPLATE}/images/right_day.gif" alt="{L_NEXT}" border="0" align="left"></a></td>
-      						</tr>
-      					</table>
-      				</td>
-      				<td align="right" width="90" class="navback">	
-      					<table width="90" border="0" cellpadding="0" cellspacing="0">
-							<tr>
-								<td><a class="psf" href="day.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" border="0"></a></td>
-								<td><a class="psf" href="week.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" border="0"></a></td>
-								<td><a class="psf" href="month.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" border="0"></a></td>
+				<tr valign="top">
+					<td align="left" width="400" class="navback"><div style="padding: 5px;"><span class="H20">{DISPLAY_DATE}</span><br /><span class="V9G">{CALENDAR_NAME} {L_CALENDAR}</span></div></td>
+					<td valign="top" align="right" width="120" class="navback">	
+						<div style="padding-top: 3px;">
+						<table width="90" border="0" cellpadding="0" cellspacing="0">
+							<tr valign="top">
+								<td><a class="psf" href="day.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" border="0" /></a></td>
+								<td><a class="psf" href="week.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" border="0" /></a></td>
+								<td><a class="psf" href="month.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" border="0" /></a></td>
 							</tr>
 						</table>
+						</div>
 					</td>
-      			</tr>
-      		</table>
+				</tr>  			
+			</table>
       	</td>
     </tr>
 	<tr>
@@ -32,63 +26,45 @@
 	</tr>
 	<tr>
 		<td colspan="3">
-				<table border="0" cellspacing="0" cellpadding="0" width="100%">
-					<tr>
-						<td align="center" valign="top">
-							<table width="100%" border="0" cellspacing="0" cellpadding="0">
+			<table border="0" cellspacing="0" cellpadding="5" width="100%">
+				<tr>
+					<td align="left" valign="top">
+						<div class="V12"><b>{DAYOFMONTH}</b></div>
+						<!-- loop events on -->
+						<div style="padding: 6px;">
+							<table width="100%" border="0" cellspacing="1" cellpadding="1">
 								<tr>
-									<td colspan="3" height="1"></td>
+									<td width="100" class="G10BOLD">{L_TIME}:</td>
+									<td align="left" class="G10B">{EVENT_START}</td>
 								</tr>
 								<tr>
-									<td width="10"><img src="images/spacer.gif" width="10" height="1" alt=" "></td>
-									<td align="left" colspan="2"><font class="V12"><b>{DAYOFMONTH}</b></font></td>
+									<td valign="top" width="100" class="G10BOLD">{L_SUMMARY}:</td>
+									<td valign="top" align="left" class="G10B">{EVENT_TEXT}</td>
 								</tr>
+								<!-- switch description_events on -->
 								<tr>
-									<td colspan="3"><img src="images/spacer.gif" width="1" height="5" alt=" "></td>
+									<td valign="top" width="100" class="G10BOLD">{L_DESCRIPTION}:</td>
+									<td valign="top" align="left" class="G10B">{DESCRIPTION}</td>
 								</tr>
-											
-								<!-- loop events on -->
-								<tr>
-									<td width="10"><img src="images/spacer.gif" width="10" height="1" alt=" "></td>
-									<td width="10"><img src="images/spacer.gif" width="10" height="1" alt=" "></td>
-									<td align="left">
-										<table width="100%" border="0" cellspacing="1" cellpadding="1">
-											<tr>
-												<td width="100" class="G10BOLD">{L_TIME}:</td>
-												<td align="left" class="G10B">{EVENT_START}</td>
-											</tr>
-											<tr>
-												<td valign="top" width="100" class="G10BOLD">{L_SUMMARY}:</td>
-												<td valign="top" align="left" class="G10B">{EVENT_TEXT}</td>
-											</tr>
-											<!-- switch description_events on -->
-											<tr>
-												<td valign="top" width="100" class="G10BOLD">{L_DESCRIPTION}:</td>
-												<td valign="top" align="left" class="G10B">{DESCRIPTION}</td>
-											</tr>
-											<!-- switch description_events off -->
-										</table>
-									</td>
-								</tr>			
-								<tr>
-									<td colspan="3"><img src="images/spacer.gif" width="1" height="10" alt=" "></td>
-								</tr>
-								<!-- loop events off -->
-																	
-								<!-- switch no_events on -->
-								<tr>
-									<td width="10"><img src="images/spacer.gif" width="10" height="1" alt=" "></td>
-									<td align="left" colspan="2"><font class="V12"><br><center><b>{L_ZERO_EVENTS}</b></center></font><br></td>
-								</tr>
-								<tr>
-									<td colspan="3"><img src="images/spacer.gif" width="1" height="5" alt=" "></td>
-								</tr>
-								<!-- switch no_events off -->
-								
-						</table>
+								<!-- switch description_events off -->
+							</table>
+						</div>
+						<!-- loop events off -->
+															
+						<!-- switch no_events on -->
+						<div class="V12"><b>{L_ZERO_EVENTS}</b></div>
+						<!-- switch no_events off -->
 					</td>
 				</tr>
 			</table>		
 		</td>
 	</tr>
 </table>
+<table width="650" border="0" cellpadding="0" cellspacing="0">
+	<tr>
+		<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
+		<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
+		<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
+	</tr>
+</table>
+{FOOTER}
\ No newline at end of file
diff --git a/templates/default/week.tpl b/templates/default/week.tpl
index 75d9f98..3fa2114 100644
--- a/templates/default/week.tpl
+++ b/templates/default/week.tpl
@@ -33,10 +33,10 @@
 										<table width="100%" border="0" cellspacing="0" cellpadding="2">
 											<tr>
 												<td align="left" valign="top" width="30" class="rowOff" onmouseover="this.className='rowOn'" onmouseout="this.className='rowOff'" onclick="window.location.href='week.php?cal={CAL}&amp;getdate={PREV_WEEKK}'">
-													<span class="V12"><a class="psf" href="week.php?cal={CAL}&amp;getdate={PREV_WEEK}">&laquo;</a></span>
+													<span class="V12">&nbsp;&nbsp;<a class="psf" href="week.php?cal={CAL}&amp;getdate={PREV_WEEK}">&laquo;</a></span>
 												</td>
 												<td align="right" valign="top" width="30" class="rowOff" onmouseover="this.className='rowOn'" onmouseout="this.className='rowOff'" onclick="window.location.href='week.php?cal={CAL}&amp;getdate={NEXT_WEEK}'">
-													<span class="V12"><a class="psf" href="week.php?cal={CAL}&amp;getdate={NEXT_WEEK}">&raquo;</a></span>
+													<span class="V12"><a class="psf" href="week.php?cal={CAL}&amp;getdate={NEXT_WEEK}">&raquo;</a>&nbsp;&nbsp;</span>
 												</td>
 												<!-- loop daysofweek on -->
 												<td width="80" align="center" class="{ROW1}" onmouseover="this.className='{ROW2}'" onmouseout="this.className='{ROW3}'" onclick="window.location.href='day.php?cal={CAL}&amp;getdate={DAYLINK}'">
@@ -45,6 +45,18 @@
 												<!-- loop daysofweek off -->
 											</tr>
 											<tr>
+												<td width="60" class="rowOff" colspan="2">
+												<!-- loop alldaysofweek on -->
+												<td>
+													<!-- loop allday on -->
+													<div class="alldaybg_{CALNO}">
+														{EVENT}
+													</div>
+													<!-- loop allday off -->
+												</td>
+												<!-- loop alldaysofweek off -->
+											</tr>
+											<tr>
 												<td rowspan="4" align="center" valign="top" width="60" class="timeborder" colspan="2">
 													8:00 AM
 												</td>
@@ -146,6 +158,13 @@
 						</td>
 					</tr>
 				</table>
+				<table width="100%" border="0" cellpadding="0" cellspacing="0">
+					<tr>
+						<td class="tbll"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
+						<td class="tblbot"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
+						<td class="tblr"><img src="images/spacer.gif" alt="" width="8" height="4" /></td>
+					</tr>
+				</table>
 			</td>
 			<td width="10">
 				<img src="images/spacer.gif" width="10" height="1" alt=" ">
diff --git a/week.php b/week.php
index 26de6bc..88f4bd6 100644
--- a/week.php
+++ b/week.php
@@ -48,6 +48,7 @@ $page->replace_tags(array(
 	'getdate'			=> $getdate,
 	'calendar_name'		=> $calendar_name,
 	'display_date'		=> $display_date,
+	'current_view'		=> $current_view,
 	'sidebar_date'		=> $sidebar_date,
 	'rss_powered'	 	=> $rss_powered,
 	'rss_available' 	=> '',