Mid-day sanity checkin.

5 files changed, 121 insertions, 39 deletions

diff --git a/templates/default/calendar_nav.tpl b/templates/default/calendar_nav.tpl
index e0cfa47..c32e61f 100644
--- a/templates/default/calendar_nav.tpl
+++ b/templates/default/calendar_nav.tpl
@@ -2,6 +2,13 @@
 	<tr>
 		<td width="1%" valign="top" align="right">
 			{MONTH_SMALL|-1}
+			<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="98%" valign="top" align="center">
 			<table border="0" width="330" cellspacing="0" cellpadding="0">
@@ -9,7 +16,7 @@
 					<td width="160" valign="top">
 						<table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder">
 							<tr height="20">
-								<td align="center" class="sideback"><b>{L_JUMP_TO}</b></td>
+								<td align="center" class="sideback"><b>{L_JUMP}</b></td>
 							</tr>
 							<tr>
 								<td>
@@ -34,36 +41,63 @@
 								</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>
 						<img src="images/spacer.gif" width="20" height="1" alt=" ">
 					</td>
 					<td width="160" valign="top">
-						<div style="padding: 5px;">
-							<font class="G10BOLD">{CAL_DISPLAYNAME2}</font><br>
-							<span class="G10">
-								<a class="psf" href="day.php?cal={CAL}&amp;getdate={REALLY_TODAY_TODAY}">{L_GODAY}</a><br>
-								<a class="psf" href="week.php?cal={CAL}&amp;getdate={REALLY_TODAY_TODAY}">{L_GOWEEK}</a><br>
-								<a class="psf" href="month.php?cal={CAL}&amp;getdate={REALLY_TODAY_TODAY}">{L_GOMONTH}</a><br>
-								<a class="psf" href="year.php?cal={CAL}&amp;getdate={REALLY_TODAY_TODAY}">{L_GOYEAR}</a><br>
-								<a class="psf" href="print.php?cal={CAL}&amp;getdate={GETDATE}&amp;printview={CURRENT_VIEW}">{L_GOPRINT}</a><br>
-								<!-- switch allow_preferences on -->
-								<a class="psf" href="preferences.php?cal={CAL}&amp;getdate={GETDATE}">{L_PREFERENCES}</a><br>
-								<!-- switch allow_preferences off -->
-								<!-- switch display_download on -->
-								<a class="psf" href="{SUBSCRIBE_PATH}">{L_SUBSCRIBE}</a>&nbsp;|&nbsp;<a class="psf" href="{DOWNLOAD_FILENAME}">{L_DOWNLOAD}</a><br>
-								<!-- switch display_download off -->
-								<!-- switch is_logged_in on -->
-								<a class="psf" href="{SCRIPT_NAME}?{QUERYS}">Logout {USERNAME}</a>
-								<!-- switch is_logged_in off -->
-							</span>
-						</div>
+						<table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder">
+							<tr height="20">
+								<td align="center" class="sideback"><b>{CALENDAR_NAME}</b></td>
+							</tr>
+							<tr>
+								<td>
+									<div style="padding: 5px;">
+										<a class="psf" href="day.php?cal={CAL}&amp;getdate={REALLY_TODAY_TODAY}">{L_GODAY}</a><br>
+										<a class="psf" href="week.php?cal={CAL}&amp;getdate={REALLY_TODAY_TODAY}">{L_GOWEEK}</a><br>
+										<a class="psf" href="month.php?cal={CAL}&amp;getdate={REALLY_TODAY_TODAY}">{L_GOMONTH}</a><br>
+										<a class="psf" href="year.php?cal={CAL}&amp;getdate={REALLY_TODAY_TODAY}">{L_GOYEAR}</a><br>
+										<a class="psf" href="print.php?cal={CAL}&amp;getdate={GETDATE}&amp;printview={CURRENT_VIEW}">{L_GOPRINT}</a><br>
+										<!-- switch allow_preferences on -->
+										<a class="psf" href="preferences.php?cal={CAL}&amp;getdate={GETDATE}">{L_PREFERENCES}</a><br>
+										<!-- switch allow_preferences off -->
+										<!-- switch display_download on -->
+										<a class="psf" href="{SUBSCRIBE_PATH}">{L_SUBSCRIBE}</a>&nbsp;|&nbsp;<a class="psf" href="{DOWNLOAD_FILENAME}">{L_DOWNLOAD}</a><br>
+										<!-- switch display_download off -->
+										<!-- switch is_logged_in on -->
+										<a class="psf" href="{SCRIPT_NAME}?{QUERYS}">Logout {USERNAME}</a>
+										<!-- switch is_logged_in off -->
+									</div>
+								</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>
 				</tr>
 			</table>
 		</td>
 		<td width="1%" valign="top" align="left">
 			{MONTH_SMALL|+1}
+			<table width="170" 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>
 	</tr>
 </table>
\ No newline at end of file
diff --git a/templates/default/footer.tpl b/templates/default/footer.tpl
index 3ce9084..87e6e28 100644
--- a/templates/default/footer.tpl
+++ b/templates/default/footer.tpl
@@ -6,8 +6,9 @@
 </p>
 <!-- switch rss_valid off -->
 <!-- switch rss_powered on -->
-{L_THIS_SITE_IS} <a class="psf" href="{BASE}rss/index.php?cal={CAL}&amp;getdate={GETDATE}">RSS-Enabled</a>
+{L_THIS_SITE_IS} <a class="psf" href="{BASE}rss/index.php?cal={CAL}&amp;getdate={GETDATE}">RSS-Enabled</a><br>
 <!-- switch rss_powered off -->
+Page generated in {GENERATED} seconds.
 </center>
 </body>
 </html>
diff --git a/templates/default/month.tpl b/templates/default/month.tpl
index 072c7ce..c33987d 100644
--- a/templates/default/month.tpl
+++ b/templates/default/month.tpl
@@ -45,8 +45,8 @@
 	<table width="737" border="0" cellspacing="0" cellpadding="0" class="calborder">
 		<tr>
 			<td colspan="3" align="center" class="sideback" nowrap>
-				<div style="height: 20px;" class="G10BOLD">
-					{L_THIS_MONTHS_EVENTS}
+				<div style="height: 20px;">
+					<b>{L_THIS_MONTHS}</b>
 				</div>
 			</td>
 		</tr>
diff --git a/templates/default/month_large.tpl b/templates/default/month_large.tpl
index c51cfe2..0290a1d 100644
--- a/templates/default/month_large.tpl
+++ b/templates/default/month_large.tpl
@@ -1,4 +1,3 @@
-
 <table width="735" border="0" cellspacing="1" cellpadding="2" class="monthback">
 	<tr>
 		<!-- loop weekday on -->
@@ -11,42 +10,73 @@
 	</tr>
 	<!-- loop monthweeks on -->
 	<tr height="105">
+		<!-- loop monthdays on -->
 		<!-- switch notthismonth on -->
 		<td valign="top" align="left" class="monthoff" width="105" height="105">
+			
 			<div align="right">
-				<font class="G10"><a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}"><font class="G10G">{DAY}</font></a></font>
+				<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}"><font class="G10G">{DAY}</font></a>
 			</div>
+			<!-- switch allday on -->
+			<div align="left">
+				<div align="center" class="V10">
+					{JS_OPEN_EVENT} <a class="psf" href="#" onclick="openEventWindow({EVENT_NUMBER}); return false;">{EVENT_TITLE}</a> 
+				</div>
+			</div>
+			<!-- switch allday off -->
+			<!-- switch event on -->
 			<div align="left">
 				<div align="left" class="V9">
-					&nbsp; {JS_OPEN_EVENT} <a class="ps3" href="#" onclick="openEventWindow({EVENT_NUMBER}); return false;">{EVENT_TITLE}</a> 
+					&nbsp; {JS_OPEN_EVENT} <a class="ps3" href="#" onclick="openEventWindow({EVENT_NUMBER}); return false;">{EVENT_TIME} {EVENT_TITLE}</a> 
 				</div>
 			</div>
+			<!-- switch event off -->
+			
 		</td>
 		<!-- switch notthismonth off -->
-		<!-- switch isevent on -->
-		<td valign="top" align="left" class="monthreg" width="105" height="105">
+		<!-- switch istoday on -->
+		<td valign="top" align="left" class="monthon" width="105" height="105">
 			<div align="right">
-				<font class="G10"><a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a></font>
+				<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a>
 			</div>
+			<!-- switch allday on -->
+			<div align="left">
+				<div align="center" class="V10">
+					{JS_OPEN_EVENT} <a class="ps3" href="#" onclick="openEventWindow({EVENT_NUMBER}); return false;">{EVENT_TITLE}</a> 
+				</div>
+			</div>
+			<!-- switch allday off -->
+			<!-- switch event on -->
 			<div align="left">
 				<div align="left" class="V9">
-					&nbsp; {JS_OPEN_EVENT} <a class="ps3" href="#" onclick="openEventWindow({EVENT_NUMBER}); return false;">{EVENT_TITLE}</a> 
+					&nbsp; {JS_OPEN_EVENT} <a class="ps3" href="#" onclick="openEventWindow({EVENT_NUMBER}); return false;">{EVENT_TIME} {EVENT_TITLE}</a> 
 				</div>
 			</div>
+			<!-- switch event off -->
 		</td>
-		<!-- switch isevent off -->
-		<!-- switch notevent on -->
+		<!-- switch istoday off -->
+		<!-- switch ismonth on -->
 		<td valign="top" align="left" class="monthreg" width="105" height="105">
 			<div align="right">
-				<font class="G10"><a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a></font>
+				<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a>
+			</div>
+			<!-- switch allday on -->
+			<div align="left">
+				<div align="left" class="V9">
+					{JS_OPEN_EVENT} <a class="ps3" href="#" onclick="openEventWindow({EVENT_NUMBER}); return false;">{EVENT_TITLE}</a> 
+				</div>
 			</div>
+			<!-- switch allday off -->
+			<!-- switch event on -->
 			<div align="left">
 				<div align="left" class="V9">
-					&nbsp; {JS_OPEN_EVENT} <a class="ps3" href="#" onclick="openEventWindow({EVENT_NUMBER}); return false;">{EVENT_TITLE}</a> 
+					&nbsp; {JS_OPEN_EVENT} <a class="ps3" href="#" onclick="openEventWindow({EVENT_NUMBER}); return false;">{EVENT_TIME} {EVENT_TITLE}</a> 
 				</div>
 			</div>
+			<!-- switch event off -->
 		</td>
-		<!-- switch notevent off -->
+		<!-- switch ismonth off -->
+		<!-- loop monthdays off -->
 	</tr>
 	<!-- loop monthweeks off -->
 </table>
diff --git a/templates/default/month_small.tpl b/templates/default/month_small.tpl
index 93552b4..5ecb02f 100644
--- a/templates/default/month_small.tpl
+++ b/templates/default/month_small.tpl
@@ -12,21 +12,38 @@
 				</tr>
 				<!-- loop monthweeks on -->
 				<tr align="center">
+					<!-- loop monthdays on -->
 					<!-- switch notthismonth on -->
 					<td>
+						<!-- switch anyevent on -->
 						<a class="psf" href="{MINICAL_VIEW}.php?cal={CAL}&amp;getdate={DAYLINK}"><span class="G10G">{DAY}</span></a>
+						<!-- switch anyevent off -->
+						<!-- switch noevent on -->
+						<a class="psf" href="{MINICAL_VIEW}.php?cal={CAL}&amp;getdate={DAYLINK}"><span class="G10G">{DAY}</span></a>
+						<!-- switch noevent off -->
 					</td>
 					<!-- switch notthismonth off -->
-					<!-- switch isevent on -->
+					<!-- switch istoday on -->
 					<td>
+						<!-- switch anyevent on -->
 						<a class="ps2" href="{MINICAL_VIEW}.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a>
+						<!-- switch anyevent off -->
+						<!-- switch noevent on -->
+						<a class="psf" href="{MINICAL_VIEW}.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a>
+						<!-- switch noevent off -->
 					</td>
-					<!-- switch isevent off -->
-					<!-- switch notevent on -->
+					<!-- switch istoday off -->
+					<!-- switch ismonth on -->
 					<td>
+						<!-- switch anyevent on -->
+						<a class="ps2" href="{MINICAL_VIEW}.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a>
+						<!-- switch anyevent off -->
+						<!-- switch noevent on -->
 						<a class="psf" href="{MINICAL_VIEW}.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a>
+						<!-- switch noevent off -->
 					</td>
-					<!-- switch notevent off -->
+					<!-- switch ismonth off -->
+					<!-- loop monthdays off -->
 				</tr>
 				<!-- loop monthweeks off -->
 			</table>