Placed print template in place, started wiring print.php

3 files changed, 72 insertions, 70 deletions

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=" ">