HTML/CSS template rewrites, nice-title integration, XSS fixes, version bump

9 files changed, 21 insertions, 796 deletions

diff --git a/templates/grey/calendar_nav.tpl b/templates/grey/calendar_nav.tpl
deleted file mode 100644
index a48cfbe..0000000
--- a/templates/grey/calendar_nav.tpl
+++ /dev/null
@@ -1,151 +0,0 @@
-<table border="0" width="737" cellspacing="0" cellpadding="0">
-	<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">
-				<tr>
-					<td width="160" valign="top">
-						<table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder">
-							<tr>
-								<td align="center" class="sideback"><div style="height:16px;"><b>{L_JUMP}</b></div></td>
-							</tr>
-							<tr>
-								<td>
-									<div style="padding: 5px;">
-										<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php" method="get">
-											<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_JUMPS}</select><br />
-											<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_ICALS}</select><br />
-											<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_YEARS}</select><br />
-											<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_MONTHS}</select><br />
-											<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_WEEKS}</select><br />
-										<input type="hidden" name="cpath" value="{CPATH}"/>
-
-										</form>
-										<!-- switch show_search on -->
-										{SEARCH_BOX}
-										<!-- switch show_search off -->
-										<!-- switch show_goto on -->
-										<form style="margin-bottom:0;" action="day.php" method="get"/>
-											<input type="hidden" name="cpath" value="{CPATH}"/>
-											<input type="hidden" name="cal" value="{URL_CAL}"/>
-											<input type="text" style="width:160px; font-size:10px" name="jumpto_day"/>
-											<input type="submit" value="Go"/>
-										</form>
-										<!-- switch show_goto off -->
-										<hr />
-										<div class = 'G10BOLD'>{L_PICK_MULTIPLE}:</div>
-										<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php" method="get">
-											<input type="hidden" name="getdate" value="{GETDATE}"/>
-											<input type="hidden" name="cpath" value="{CPATH}"/>
-											<select name="cal[]" class="query_style" size="5" multiple="multiple">{LIST_ICALS_PICK}</select><br />
-											<input type="submit" value="Go"/>
-										</form>
-									</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>
-					<td>
-						<img src="images/spacer.gif" width="20" height="1" alt=" " />
-					</td>
-					<td width="160" valign="top">
-					<!-- switch show_user_login on -->
-					<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php?{LOGIN_QUERYS}" method="post">
-					<input type="hidden" name="action" value="login" />
-					<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
-						<tr>
-							<td colspan="2" align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_LOGIN}</div></td>
-						</tr>
-						<!-- switch invalid_login on -->
-						<tr>
-							<td colspan="2" bgcolor="#FFFFFF" align="left">
-								<div style="padding-left: 5px; padding-top: 5px; padding-right: 5px;">
-									<font color="red">{L_INVALID_LOGIN}</font>
-								</div>
-							</td>
-						</tr>
-						<!-- switch invalid_login off -->
-						<tr>
-							<td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-top: 5px;">{L_USERNAME}:</div></td>
-							<td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-top: 5px;"><input type="text" name="username" size="10" /></div></td>
-						</tr>
-						<tr>
-							<td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-bottom: 5px;">{L_PASSWORD}:</div></td>
-							<td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-bottom: 5px;"><input type="password" name="password" size="10" /></div></td>
-						</tr>
-						<tr>
-							<td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style="padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td>
-						</tr>
-					</table>
-					</form>
-					<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>
-					<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-					<!-- switch show_user_login off -->
-						<table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder">
-							<tr>
-								<td align="center" class="sideback"><div style="height:16px;"><b>{SIDEBAR_DATE}</b></div></td>
-							</tr>
-							<tr>
-								<td>
-									<div style="padding-left: 5px;">
-										<b>{L_LEGEND}:</b><br />
-										{LEGEND}
-										<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="{CURRENT_VIEW}.php?{LOGOUT_QUERYS}">{L_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>
diff --git a/templates/grey/day.tpl b/templates/grey/day.tpl
deleted file mode 100644
index c66d40f..0000000
--- a/templates/grey/day.tpl
+++ /dev/null
@@ -1,104 +0,0 @@
-{HEADER}
-<center>
-<table border="0" width="700" cellspacing="0" cellpadding="0">
-	<tr>
-		<td width="520" valign="top">
-			<table width="520" border="0" cellspacing="0" cellpadding="0" class="calborder">
-				<tr>
-					<td align="center" valign="middle">
-						<table width="100%" border="0" cellspacing="0" cellpadding="0">
-							<tr valign="top">
-								<td align="left" width="400" class="title"><h1>{DISPLAY_DATE}</h1><span class="V9G">{CALENDAR_NAME} {L_CALENDAR}</span></td>
-								<td align="right" width="120" class="navback">	
-									<div style="padding-top: 3px;">
-									<table width="120" border="0" cellpadding="0" cellspacing="0">
-										<tr valign="top">
-											<td><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{L_DAY}" title="{L_DAY}" border="0" /></td>
-											<td><a class="psf" href="week.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{L_WEEK}" title="{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}" title="{L_MONTH}" border="0" /></a></td>
-											<td><a class="psf" href="year.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" title="{L_YEAR}" border="0" /></a></td>
-										</tr>
-									</table>
-									</div>
-								</td>
-							</tr>
-							<tr>	
-								<td colspan="2">
-									<table width="100%" border="0" cellspacing="0" cellpadding="2" class="tfixed">
-										<tr>
-											<td align="left" valign="top" width="20" class="rowOff2" onmouseover="this.className='rowOn2'" onmouseout="this.className='rowOff2'" onclick="window.location.href='day.php?cal={CAL}&amp;getdate={PREV_DAY}'">
-												<span class="V12"><a class="psf" href="day.php?cal={CAL}&amp;getdate={PREV_DAY}">&laquo;</a></span>
-											</td>
-											<!-- loop daysofweek on -->
-											<td width="14%" align="center" class="{ROW1}" onmouseover="this.className='{ROW2}'" onmouseout="this.className='{ROW3}'" onclick="window.location.href='day.php?cal={CAL}&amp;getdate={DAYLINK}'">
-												<span class="V9BOLD"><a class="ps3" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a></span>
-											</td>
-											<!-- loop daysofweek off -->
-											<td align="right" valign="top" width="20" class="rowOff" onmouseover="this.className='rowOn'" onmouseout="this.className='rowOff'" onclick="window.location.href='day.php?cal={CAL}&amp;getdate={NEXT_DAY}'">
-												<span class="V12"><a class="psf" href="day.php?cal={CAL}&amp;getdate={NEXT_DAY}">&raquo;</a></span>
-											</td>
-										</tr>	
-									</table>
-								</td>
-							</tr>      			
-						</table>
-					</td>
-				</tr>
-				<tr id="allday">
-					<td>
-						<!-- loop allday on -->
-						<div class="alldaybg_{CALNO}">
-							{ALLDAY}
-						</div>
-						<!-- loop allday off -->
-					</td>
-				</tr>
-      			<tr>
-					<td align="center" valign="top" colspan="3">
-						<table width="100%" border="0" cellspacing="0" cellpadding="0">
-							<!-- loop row on -->
-							<tr>
-								<td rowspan="4" align="center" valign="top" width="60" class="timeborder">9:00 AM</td>
-								<td width="1" height="15"></td>
-								<td class="dayborder">&nbsp;</td>
-							</tr>
-							<tr>
-								<td width="1" height="15"></td>
-								<td class="dayborder2">&nbsp;</td>
-							</tr>
-							<tr>
-								<td width="1" height="15"></td>
-								<td class="dayborder">&nbsp;</td>
-							</tr>
-							<tr>
-								<td width="1" height="15"></td>
-								<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>
-        	</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=" " /></td>
-		<td width="170" valign="top">
-			{SIDEBAR}
-		</td>
-	</tr>
-</table>
-</center>
-{FOOTER}
-
diff --git a/templates/grey/default.css b/templates/grey/default.css
index af09e5c..4c77b7f 100644
--- a/templates/grey/default.css
+++ b/templates/grey/default.css
@@ -31,6 +31,8 @@ table, td {font: 11px Verdana, Arial, sans-serif; color: #000;}
 .eventbg_5	 	{ background-color: #705f60; padding: 2px;}

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

 .eventbg_7	 	{ background-color: #a0a090; padding: 2px;}

+#allday a		{ font-size: 9px; color: #fff; font-weight: 900; text-decoration:none;}

+#allday a:hover	{ text-decoration:underline;}

 

 

 .eventbg2_1	 		{ background-color: #505050; border: 1px solid #303030; }

@@ -47,6 +49,9 @@ table, td {font: 11px Verdana, Arial, sans-serif; color: #000;}
 .title  		{ background-image: url(images/time_bg.gif); padding: 5px; }

 .title h1 		{ font-family: Helvetica, sans-serif; font-size: 18px; color: #000; margin: 0px;}

 

+/* Main class used for all page wrapper tables */

+.maintable		{ width: 990px; }

+

 /* Month View */

 

 .monthback		{ background-color: #A1A5A9; }

@@ -64,6 +69,9 @@ table, td {font: 11px Verdana, Arial, sans-serif; color: #000;}
 .yearon			{ background-color: #F2F9FF; height: 30px; width: 30px; text-align: right;  vertical-align: top; font-size: 9px; }

 .yearmonth		{ background-color: #ccc; }

 .yearweek		{ background-color: #eee; width: 30px; font-size: 9px; font-weight: 900; text-align: center; height: 15px; }

+.yearleft		{ padding-right: 5px; padding-top: 5px; padding-bottom: 5px; }

+.yearmiddle		{ padding: 5px; }

+.yearright		{ padding-left: 5px; padding-top: 5px; padding-bottom: 5px; }

 

 

 /* older styles */

@@ -138,3 +146,13 @@ body			{ background-image: url(images/background.gif); }
 .query_style 	{ font-size: 11px; font-family: verdana, geneva, arial, sans-serif; width: 156px; margin-bottom: 0; }

 .search_style 	{ font-size: 12px; font-family: verdana, geneva, arial, sans-serif; width: 134px; margin-bottom: 0; }

 .login_style	{ font-size: 11px; font-family: verdana, geneva, arial, sans-serif; width: 80px; margin-bottom: 0; }

+

+

+/* Make printed pages look nice */

+@media print {

+	.sidebar		{ width: 0px; display: none; }

+	.footer			{ display: none; }

+	.monthback		{ border-spacing: 0; }

+	.monthback td	{ border: 1px solid #606060; }

+	.calborder		{ border: 1px solid #606060; }

+}

diff --git a/templates/grey/header.tpl b/templates/grey/header.tpl
index d8e07dc..cd2a631 100644
--- a/templates/grey/header.tpl
+++ b/templates/grey/header.tpl
@@ -4,7 +4,9 @@
 <head>
 	<meta http-equiv="content-type" content="text/html; charset={CHARSET}" />
 	<title>{CALENDAR_NAME} - {DISPLAY_DATE}</title>
-  	<link rel="stylesheet" type="text/css" href="{DEFAULT_PATH}/templates/{TEMPLATE}/default.css" />
+	<link rel="stylesheet" type="text/css" href="{DEFAULT_PATH}/templates/{TEMPLATE}/default.css" />
+	<script id="nicetitle" type="text/javascript" src="{DEFAULT_PATH}/nicetitle/nicetitle.js"></script>
+	<link rel="stylesheet" type="text/css" href="{DEFAULT_PATH}/nicetitle/nicetitle.css" />
 	<!-- switch rss_available on -->
 	<link rel="alternate" type="application/rss+xml" title="RSS" href="{DEFAULT_PATH}/rss/rss.php?cal={CAL}&amp;rssview={CURRENT_VIEW}">
 	<!-- switch rss_available off -->		
diff --git a/templates/grey/month.tpl b/templates/grey/month.tpl
deleted file mode 100644
index 7dcff53..0000000
--- a/templates/grey/month.tpl
+++ /dev/null
@@ -1,88 +0,0 @@
-{HEADER}
-<center>
-	<table width="735" border="0" cellspacing="0" cellpadding="0" class="calborder">
-		<tr>
-			<td align="center" valign="middle">
-				<table width="100%" border="0" cellspacing="0" cellpadding="0">
-					<tr valign="top">
-						<td align="left" width="615" class="title"><h1>{DISPLAY_DATE}</h1><span class="V9G">{CALENDAR_NAME} {L_CALENDAR}</span></td>
-						<td align="right" width="120" class="navback">	
-							<div style="padding-top: 3px;">
-							<table width="120" 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}" title="{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}" title="{L_WEEK}" border="0" /></a></td>
-									<td><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{L_MONTH}" title="{L_MONTH}" border="0" /></td>
-									<td><a class="psf" href="year.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" title="{L_YEAR}" border="0" /></a></td>
-								</tr>
-							</table>
-							</div>
-						</td>
-					</tr>  			
-				</table>
-			</td>
-		</tr>	
-	</table>
-	{MONTH_LARGE|+0}
-	<table width="735" 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>
-	<br />
-	{CALENDAR_NAV}
-	<!-- switch showbottom on -->
-	<br />
-	<table width="735" border="0" cellspacing="0" cellpadding="0" class="calborder">
-		<tr>
-			<td align="center" valign="middle" bgcolor="white">
-				<table width="100%" border="0" cellspacing="0" cellpadding="0">
-					<tr>
-						<td align="right" width="40%" class="navback"><a class="psf" href="month.php?cal={CAL}&amp;getdate={PREV_MONTH}"><img src="templates/{TEMPLATE}/images/left_day.gif" alt="{L_PREV}" border="0" align="right" /></a></td>
-						<td align="center" width="20%" class="title" nowrap="nowrap" valign="middle"><h1>{L_THIS_MONTHS}</h1></td>
-						<td align="left" width="40%" class="navback"><a class="psf" href="month.php?cal={CAL}&amp;getdate={NEXT_MONTH}"><img src="templates/{TEMPLATE}/images/right_day.gif" alt="{L_NEXT}" border="0" align="left" /></a></td>
-					</tr>
-				</table>
-			</td>
-		</tr>	
-		<tr>
-			<td>
-				<table width="100%" cellspacing="1" cellpadding="4" border="0">
-					<!-- loop showbottomevents_odd on -->
-					<tr align="left" valign="top">
-						<td width="170" nowrap="nowrap">
-							<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{START_DATE}</a><br />
-							<span class="V9G">{START_TIME}</span>
-						</td>
-						<td>
-							{EVENT_TEXT}<br /><span class="V9G">{CALNAME}</span>
-						</td>
-					</tr>
-					<!-- loop showbottomevents_odd off -->
-					<!-- loop showbottomevents_even on -->
-					<tr align="left" valign="top">
-						<td width="170" nowrap="nowrap" bgcolor="#EEEEEE">
-							<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{START_DATE}</a><br />
-							<span class="V9G">{START_TIME}</span>
-						</td>
-						<td bgcolor="#EEEEEE">
-							{EVENT_TEXT}<br /><span class="V9G">{CALNAME}</span>
-						</td>
-					</tr>
-					<!-- loop showbottomevents_even off -->
-				</table>
-			</td>
-		</tr>
-	</table>
-	<table width="737" 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>
-	<!-- switch showbottom off -->
-</center>
-{FOOTER}
diff --git a/templates/grey/month_large.tpl b/templates/grey/month_large.tpl
deleted file mode 100644
index ca3d3d3..0000000
--- a/templates/grey/month_large.tpl
+++ /dev/null
@@ -1,42 +0,0 @@
-<table width="735" border="0" cellspacing="1" cellpadding="2" class="monthback">
-	<tr>
-		<!-- loop weekday on -->
-		<td valign="top" width="105" height="12" class="dateback">
-			<center class="V9BOLD">{LOOP_WEEKDAY}</center>
-		</td>
-		<!-- loop weekday off -->
-	</tr>
-	<!-- loop monthweeks on -->
-	<tr>
-		<!-- loop monthdays on -->
-		<!-- switch notthismonth on -->
-		<td class="monthoff">
-			<div align="right">
-				<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a>
-			</div>
-			{ALLDAY}
-			{EVENT}	
-		</td>
-		<!-- switch notthismonth off -->
-		<!-- switch istoday on -->
-		<td class="monthon">
-			<div align="right">
-				<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a>
-			</div>
-			{ALLDAY}
-			{EVENT}	
-		</td>
-		<!-- switch istoday off -->
-		<!-- switch ismonth on -->
-		<td class="monthreg">
-			<div align="right">
-				<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a>
-			</div>
-			{ALLDAY}
-			{EVENT}	
-		</td>
-		<!-- switch ismonth off -->
-		<!-- loop monthdays off -->
-	</tr>
-	<!-- loop monthweeks off -->
-</table>
diff --git a/templates/grey/month_medium.tpl b/templates/grey/month_medium.tpl
deleted file mode 100644
index 96e8e6b..0000000
--- a/templates/grey/month_medium.tpl
+++ /dev/null
@@ -1,45 +0,0 @@
-<table border="0" width="210" cellspacing="0" cellpadding="0" class="calborder">
-	<tr>
-		<td align="center" class="medtitle">{MONTH_TITLE}</td>
-	</tr>
-	<tr>
-		<td>
-			<table border="0" width="210" cellspacing="1" cellpadding="0" class="yearmonth">
-				<tr>
-					<!-- loop weekday on -->
-					<td class="yearweek">{LOOP_WEEKDAY}</td>
-					<!-- loop weekday off -->
-				</tr>
-				<!-- loop monthweeks on -->
-				<tr>
-					<!-- loop monthdays on -->
-					<!-- switch notthismonth on -->
-					<td class="yearoff">
-						<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a>
-					</td>
-					<!-- switch notthismonth off -->
-					<!-- switch istoday on -->
-					<td class="yearon">
-						<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a>
-						<div align="center">
-							{ALLDAY}
-							{EVENT}
-						</div>
-					</td>
-					<!-- switch istoday off -->
-					<!-- switch ismonth on -->
-					<td class="yearreg">
-						<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}">{DAY}</a>
-						<div align="center">
-							{ALLDAY}
-							{EVENT}
-						</div>
-					</td>
-					<!-- switch ismonth off -->
-					<!-- loop monthdays off -->
-				</tr>
-				<!-- loop monthweeks off -->	
-			</table>
-		</td>
-	</tr>
-</table>
diff --git a/templates/grey/sidebar.tpl b/templates/grey/sidebar.tpl
deleted file mode 100644
index 8a96ae6..0000000
--- a/templates/grey/sidebar.tpl
+++ /dev/null
@@ -1,225 +0,0 @@
-<!-- switch show_user_login on -->
-<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php?{LOGIN_QUERYS}" method="post">
-<input type="hidden" name="action" value="login" />
-<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
-	<tr>
-		<td colspan="2" align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_LOGIN}</div></td>
-	</tr>
-	<!-- switch invalid_login on -->
-	<tr>
-		<td colspan="2" bgcolor="#FFFFFF" align="left">
-			<div style="padding-left: 5px; padding-top: 5px; padding-right: 5px;">
-				<font color="red">{L_INVALID_LOGIN}</font>
-			</div>
-		</td>
-	</tr>
-	<!-- switch invalid_login off -->
-	<tr>
-		<td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-top: 5px;">{L_USERNAME}:</div></td>
-		<td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-top: 5px;"><input type="text" name="username" size="10" /></div></td>
-	</tr>
-	<tr>
-		<td bgcolor="#FFFFFF" align="left" valign="middle"><div style="padding-left: 5px; padding-bottom: 5px;">{L_PASSWORD}:</div></td>
-		<td bgcolor="#FFFFFF" align="right" valign="middle"><div style="padding-right: 5px; padding-bottom: 5px;"><input type="password" name="password" size="10" /></div></td>
-	</tr>
-	<tr>
-		<td bgcolor="#FFFFFF" align="center" valign="middle" colspan="2"><div style="padding-left: 5px; padding-bottom: 5px;"><input type="submit" value="{L_LOGIN}" /></div></td>
-	</tr>
-</table>
-</form>
-<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>
-<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-<!-- switch show_user_login off -->
-<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
-	<tr>
-		<td align="left" valign="top" width="24" class="sideback"><a class="psf" href="day.php?cal={CAL}&amp;getdate={PREV_DAY}"><img src="templates/{TEMPLATE}/images/left_arrows.gif" alt="{L_PREV}" width="16" height="20" border="0" align="left" /></a></td>
-		<td align="center" width="112" class="sideback"><font class="G10BOLD">{SIDEBAR_DATE}</font></td>
-		<td align="right" valign="top" width="24" class="sideback"><a class="psf" href="day.php?cal={CAL}&amp;getdate={NEXT_DAY}"><img src="templates/{TEMPLATE}/images/right_arrows.gif" alt="{L_NEXT}" width="16" height="20" border="0" align="right" /></a></td>
-	</tr>
-	<tr>
-		<td colspan="3" bgcolor="#FFFFFF" align="left">
-			<div style="padding: 5px;">
-				<b>{L_LEGEND}:</b><br />
-				{LEGEND}
-				<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="{CURRENT_VIEW}.php?{LOGOUT_QUERYS}">{L_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>
-<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-
-<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
-	<tr>
-		<td align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_JUMP}</div></td>
-	</tr>
-	<tr>
-		<td bgcolor="#FFFFFF" align="left">
-			<div style="padding: 5px;">
-				<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php" method="get">
-					<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_JUMPS}</select><br />
-					<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_ICALS}</select><br />
-					<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_YEARS}</select><br />
-					<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_MONTHS}</select><br />
-					<select name="action" class="query_style" onchange="window.location=(this.options[this.selectedIndex].value);">{LIST_WEEKS}</select><br />
-					<input type="hidden" name="cpath" value="{CPATH}"/>
-
-				</form>
-				<!-- switch show_search on -->
-				{SEARCH_BOX}
-				<!-- switch show_search off -->
-				<!-- switch show_goto on -->
-				<form style="margin-bottom:0;" action="day.php" method="get">
-					<input type="hidden" name="cal" value="{URL_CAL}">
-					<input type="text" style="width:160px; font-size:10px" name="jumpto_day">
-					<input type="submit" value="Go"/>
-				</form>
-				<!-- switch show_goto off -->
-				<hr />
-				<div class = 'G10BOLD'>{L_PICK_MULTIPLE}:</div>
-				<form style="margin-bottom:0;" action="{CURRENT_VIEW}.php" method="get">
-					<input type="hidden" name="cpath" value="{CPATH}"/>
-					<input type="hidden" name="getdate" value="{GETDATE}"/>
-					<select name="cal[]" class="query_style" size="5" multiple="multiple">{LIST_ICALS_PICK}</select><br />
-					<input type="submit" value="Go"/>
-				</form>
-			</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>
-<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-
-<!-- switch tomorrows_events on -->
-
-<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
-	<tr>
-		<td align="center" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_TOMORROWS}</div></td>
-	</tr>
-	<tr>
-		<td bgcolor="#FFFFFF" align="left">
-			<div style="padding: 5px;">
-				<!-- switch t_allday on -->
-				{T_ALLDAY}<br />
-				<!-- switch t_allday off -->
-				<!-- switch t_event on -->
-				&bull; {T_EVENT}<br />
-				<!-- switch t_event 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>
-<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-
-<!-- switch tomorrows_events off -->
-
-<!-- switch vtodo on -->
-
-<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
-	<tr>
-		<td align="center" width="98%" class="sideback"><div style="height: 17px; margin-top: 3px;" class="G10BOLD">{L_TODO}</div></td>
-	</tr>
-	<tr>
-		<td bgcolor="#FFFFFF" align="left">
-			<div style="padding: 5px;">
-				<table cellpadding="0" cellspacing="0" border="0">
-					<!-- switch show_completed on -->
-					<tr>
-						<td><img src="images/completed.gif" alt=" " width="13" height="11" border="0" align="middle" /></td>
-						<td><img src="images/spacer.gif" width="2" height="1" border="0" alt="" /></td>
-						<td><s>{VTODO_ARRAY}<font class="G10B"> {VTODO_TEXT}</font></a></s></td>
-					</tr>
-					<!-- switch show_completed off -->
-					<!-- switch show_important on -->
-					<tr>
-						<td><img src="images/important.gif" alt=" " width="13" height="11" border="0" align="middle" /></td>
-						<td><img src="images/spacer.gif" width="2" height="1" border="0" alt="" /></td>
-						<td>{VTODO_ARRAY}<font class="G10B"> {VTODO_TEXT}</font></a></td>
-					</tr>
-					<!-- switch show_important off -->
-					<!-- switch show_normal on -->
-					<tr>
-						<td><img src="images/not_completed.gif" alt=" " width="13" height="11" border="0" align="middle" /></td>
-						<td><img src="images/spacer.gif" width="2" height="1" border="0" alt="" /></td>
-						<td>{VTODO_ARRAY}<font class="G10B"> {VTODO_TEXT}</font></a></td>
-					</tr>
-					<!-- switch show_normal off -->
-				</table>
-			</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>
-<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-
-
-<!-- switch vtodo off -->
-
-{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>
-<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-
-{MONTH_SMALL|+0}
-<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>
-<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
-
-{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>
diff --git a/templates/grey/year.tpl b/templates/grey/year.tpl
deleted file mode 100644
index adb9eb4..0000000
--- a/templates/grey/year.tpl
+++ /dev/null
@@ -1,140 +0,0 @@
-{HEADER}
-<center>
-	<table width="770" border="0" cellspacing="0" cellpadding="0">
-		<tr>
-			<td width="676">
-				<table width="676" border="0" cellspacing="0" cellpadding="0" class="calborder">
-					<tr>
-						<td align="center" valign="middle" bgcolor="white">
-							<table width="100%" border="0" cellspacing="0" cellpadding="0">
-								<tr>
-									<td align="left" width="120" class="navback">
-										&nbsp;
-									</td>
-									<td class="navback">
-										<table width="100%" border="0" cellspacing="0" cellpadding="0">
-											<tr>
-												<td align="right" width="45%" class="navback">
-													<a class="psf" href="year.php?cal={CAL}&amp;getdate={PREV_YEAR}"><img src="templates/{TEMPLATE}/images/left_day.gif" alt="[Previous Year]" border="0" align="right" /></a>
-												</td>
-												<td align="center" width="10%" class="title" nowrap="nowrap" valign="middle">
-													<h1>{THIS_YEAR}</h1>
-												</td>
-												<td align="left" width="45%" class="navback">
-													<a class="psf" href="year.php?cal={CAL}&amp;getdate={NEXT_YEAR}"><img src="templates/{TEMPLATE}/images/right_day.gif" alt="[Next Year]" border="0" align="left" /></a>
-												</td>
-											</tr>
-										</table>
-									</td>
-									<td align="right" width="120" class="navback">
-										<table width="120" 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}" title="{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}" title="{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}" title="{L_MONTH}" border="0" /></a></td>
-												<td><a class="psf" href="year.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" title="{L_YEAR}" border="0" /></a></td>
-											</tr>
-										</table>
-									</td>
-								</tr>
-							</table>
-						</td>
-					</tr>
-				</table>
-				<br />
-				<table border="0" width="670" cellspacing="0" cellpadding="0">
-					<tr>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|01}
-						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|02}
-						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|03}
-						</td>
-						<td width="20" rowspan='8'>
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-					</tr>
-					<tr>
-						<td colspan="5">
-							<img src="images/spacer.gif" width="1" height="20" alt=" " />
-						</td>
-					</tr>
-					<tr>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|04}
-						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|05}
-						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|06}
-						</td>
-					</tr>
-					<tr>
-						<td colspan="5">
-							<img src="images/spacer.gif" width="1" height="20" alt=" " />
-						</td>
-					</tr>
-					<tr>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|07}
-						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|08}
-						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|09}
-						</td>
-					</tr>
-					<tr>
-						<td colspan="5">
-							<img src="images/spacer.gif" width="1" height="20" alt=" " />
-						</td>
-					</tr>
-					<tr>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|10}
-						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|11}
-						</td>
-						<td width="20">
-							<img src="images/spacer.gif" width="20" height="1" alt=" " />
-						</td>
-						<td width="210" valign="top" align="left">
-							{MONTH_MEDIUM|12}
-						</td>
-					</tr>
-				</table>
-			</td>
-			<td valign="top">
-				{SIDEBAR}
-			</td>
-		</tr>
-	</table>
-</center>
-{FOOTER}