Initial search template checkin, updated others.

3 files changed, 194 insertions, 88 deletions

diff --git a/templates/default/admin.tpl b/templates/default/admin.tpl
index 1bcca14..ccea1b8 100644
--- a/templates/default/admin.tpl
+++ b/templates/default/admin.tpl
@@ -1,14 +1,15 @@
+{HEADER}
 <center>
 <table border="0" width="700" cellspacing="0" cellpadding="0">
 	<tr>
-		<td align="center" valign="middle">
+		<td>
 			<table width="100%" border="0" cellspacing="0" cellpadding="0">
 				<tr>
 					<td align="left" width="120" class="navback"><a href="{BACK_PAGE}"><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="center" class="navback" nowrap valign="middle"><font class="H20"><?php echo "$admin_header_lang"; ?></font></td>
+								<td align="center" class="navback" nowrap valign="middle"><font class="H20">{L_ADMIN_HEADER}</font></td>
 							</tr>
 						</table>
 					</td>
@@ -125,6 +126,6 @@
 		</td>
 	</tr>
 </table>
-
+{FOOTER}
 
 
diff --git a/templates/default/preferences.tpl b/templates/default/preferences.tpl
index 5d9c2c6..6f4911b 100644
--- a/templates/default/preferences.tpl
+++ b/templates/default/preferences.tpl
@@ -2,105 +2,100 @@
 <center>
 <table border="0" width="700" cellspacing="0" cellpadding="0">
 	<tr>
-		<td width="520" valign="top" align="center">
-			<table width="640" border="0" cellspacing="0" cellpadding="0" class="calborder">
+		<td>
+			<table width="100%" border="0" cellspacing="0" cellpadding="0">
 				<tr>
-					<td align="center" valign="middle">
+					<td align="left" width="120" class="navback"><a href="{BACK_PAGE}"><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="left" width="120" class="navback"><a href="{BACK_PAGE}"><img src="templates/{TEMPLATE}/images/back.gif" alt="Back" border="0" align="left"></a></td>
-								<td class="navback">
-									<table width="100%" border="0" cellspacing="0" cellpadding="0">
-										<tr>
-											<td align="center" class="navback" nowrap valign="middle"><font class="H20">{L_PREFERENCES}</font></td>
-										</tr>
-									</table>
-								</td>
-								<td align="right" width="120" class="navback">	
-									<table width="120" border="0" cellpadding="0" cellspacing="0">
-										<tr>
-											<td><a class="psf" href="{BASE}day.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/day_on.gif" alt="{DAY_LANG}" border="0"></a></td>
-											<td><a class="psf" href="{BASE}week.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/week_on.gif" alt="{WEEK_LANG}" border="0"></a></td>
-											<td><a class="psf" href="{BASE}month.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/month_on.gif" alt="{MONTH_LANG}" border="0"></a></td>
-											<td><a class="psf" href="{BASE}year.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{YEAR_LANG}" border="0"></a></td>
-										</tr>
-									</table>
-								</td>
+								<td align="center" class="navback" nowrap valign="middle"><font class="H20">{L_PREFERENCES}</font></td>
 							</tr>
-			      		</table>
+						</table>
+					</td>
+					<td align="right" width="120" class="navback">	
+						<table width="120" 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>
+								<td><a class="psf" href="year.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" border="0"></a></td>
+							</tr>
+						</table>
 					</td>
 				</tr>
+			</table>
+		</td>
+	</tr>
+	<tr>
+		<td class="dayborder"><img src="images/spacer.gif" width="1" height="5" alt=" "></td>
+	</tr>
+	<tr>
+		<td>
+			<table width="100%" border="0" cellspacing="0" cellpadding="0" class="G10B">	
+				<!-- switch message on -->
 				<tr>
-					<td class="dayborder"><img src="images/spacer.gif" width="1" height="5" alt=" "></td>
+					<td colspan="2" align="center"><font class="G10BOLD">{MESSAGE}</font></td>
 				</tr>
+				<!-- switch message off -->
 				<tr>
-					<td>
-						<table width="100%" border="0" cellspacing="0" cellpadding="0" class="G10B">	
-							<!-- switch message on -->
-							<tr>
-								<td colspan="2" align="center"><font class="G10BOLD">{MESSAGE}</font></td>
-							</tr>
-							<!-- switch message off -->
-							<tr>
-								<td width="2%"></td>
-								<td width="98%" valign="top" align="left">
-								<form action="preferences.php?action=setcookie" METHOD="post">
-								<table border="0" width="620" cellspacing="2" cellpadding="2" align="center">
-									<tr>
-										<td align="left" valign="top" width="300" nowrap>{L_SELECT_LANG}</td>
-										<td align="left" valign="top" width="20"><img src="images/spacer.gif" alt=" " width="20" height="1" border="0"></td>
-										<td align="left" valign="top"><select name="cookie_language" class="query_style">{LANGUAGE_SELECT}</select></td>
-									</tr>
-									<tr>
-										<td align="left" valign="top" width="300" nowrap>{L_SELECT_CAL}</td>
-										<td align="left" valign="top"><img src="images/spacer.gif" alt=" " width="20" height="1" border="0"></td>
-										<td align="left" valign="top"><select name="cookie_calendar" class="query_style">{CALENDAR_SELECT}</select></td>
-									</tr>
-									<tr>
-										<td align="left" valign="top" width="300" nowrap>{L_SELECT_VIEW}</td>
-										<td align="left" valign="top"><img src="images/spacer.gif" alt=" " width="20" height="1" border="0"></td>
-										<td align="left" valign="top"><select name="cookie_view" class="query_style">{VIEW_SELECT}</select></td>
-									</tr>
-									<tr>
-										<td align="left" valign="top" width="300" nowrap>{L_SELECT_TIME}</td>
-										<td align="left" valign="top"><img src="images/spacer.gif" alt=" " width="20" height="1" border="0"></td>
-										<td align="left" valign="top"><select name="cookie_time" class="query_style">{TIME_SELECT}</select></td>
-									</tr>
-									<tr>
-										<td align="left" valign="top" width="300" nowrap>{L_SELECT_DAY}</td>
-										<td align="left" valign="top"><img src="images/spacer.gif" alt=" " width="20" height="1" border="0"></td>
-										<td align="left" valign="top"><select name="cookie_startday" class="query_style">{STARTDAY_SELECT}</select></td>
-									</tr>
-									<tr>
-										<td align="left" valign="top" width="300" nowrap>{L_SELECT_STYLE}</td>
-										<td align="left" valign="top"><img src="images/spacer.gif" alt=" " width="20" height="1" border="0"></td>
-										<td align="left" valign="top"><select name="cookie_style" class="query_style">{STYLE_SELECT}</select></td>
-									</tr>
-									<!-- switch cookie_already_set on -->
-									<tr>
-										<td align="left" valign="top" nowrap>{L_UNSET_PREFS}</td>
-										<td align="left" valign="top"><img src="images/spacer.gif" alt=" " width="20" height="1" border="0"></td>
-										<td align="left" valign="top"><INPUT TYPE="checkbox" NAME="unset" VALUE="true"></td>
-									</tr>
-									<!-- switch cookie_already_set off -->
-									<!-- switch cookie_not_set on -->
-									<tr>
-										<td align="left" valign="top" nowrap>&nbsp;</td>
-										<td align="left" valign="top"><img src="images/spacer.gif" alt=" " width="20" height="1" border="0"></td>
-										<td align="left" valign="top"><input type="submit" name="set" value="{L_SET_PREFS}"></button></td>
-									</tr>
-									<!-- switch cookie_not_set off -->
-								</table>
-								</form>
-								<br>
-								</td>
-							</tr>
-						</table>
+					<td width="2%"></td>
+					<td width="98%" valign="top" align="left">
+					<form action="preferences.php?action=setcookie" METHOD="post">
+					<table border="0" width="620" cellspacing="2" cellpadding="2" align="center">
+						<tr>
+							<td align="left" valign="top" width="300" nowrap>{L_SELECT_LANG}</td>
+							<td align="left" valign="top" width="20"><img src="images/spacer.gif" alt=" " width="20" height="1" border="0"></td>
+							<td align="left" valign="top"><select name="cookie_language" class="query_style">{LANGUAGE_SELECT}</select></td>
+						</tr>
+						<tr>
+							<td align="left" valign="top" width="300" nowrap>{L_SELECT_CAL}</td>
+							<td align="left" valign="top"><img src="images/spacer.gif" alt=" " width="20" height="1" border="0"></td>
+							<td align="left" valign="top"><select name="cookie_calendar" class="query_style">{CALENDAR_SELECT}</select></td>
+						</tr>
+						<tr>
+							<td align="left" valign="top" width="300" nowrap>{L_SELECT_VIEW}</td>
+							<td align="left" valign="top"><img src="images/spacer.gif" alt=" " width="20" height="1" border="0"></td>
+							<td align="left" valign="top"><select name="cookie_view" class="query_style">{VIEW_SELECT}</select></td>
+						</tr>
+						<tr>
+							<td align="left" valign="top" width="300" nowrap>{L_SELECT_TIME}</td>
+							<td align="left" valign="top"><img src="images/spacer.gif" alt=" " width="20" height="1" border="0"></td>
+							<td align="left" valign="top"><select name="cookie_time" class="query_style">{TIME_SELECT}</select></td>
+						</tr>
+						<tr>
+							<td align="left" valign="top" width="300" nowrap>{L_SELECT_DAY}</td>
+							<td align="left" valign="top"><img src="images/spacer.gif" alt=" " width="20" height="1" border="0"></td>
+							<td align="left" valign="top"><select name="cookie_startday" class="query_style">{STARTDAY_SELECT}</select></td>
+						</tr>
+						<tr>
+							<td align="left" valign="top" width="300" nowrap>{L_SELECT_STYLE}</td>
+							<td align="left" valign="top"><img src="images/spacer.gif" alt=" " width="20" height="1" border="0"></td>
+							<td align="left" valign="top"><select name="cookie_style" class="query_style">{STYLE_SELECT}</select></td>
+						</tr>
+						<!-- switch cookie_already_set on -->
+						<tr>
+							<td align="left" valign="top" nowrap>{L_UNSET_PREFS}</td>
+							<td align="left" valign="top"><img src="images/spacer.gif" alt=" " width="20" height="1" border="0"></td>
+							<td align="left" valign="top"><INPUT TYPE="checkbox" NAME="unset" VALUE="true"></td>
+						</tr>
+						<!-- switch cookie_already_set off -->
+						<!-- switch cookie_not_set on -->
+						<tr>
+							<td align="left" valign="top" nowrap>&nbsp;</td>
+							<td align="left" valign="top"><img src="images/spacer.gif" alt=" " width="20" height="1" border="0"></td>
+							<td align="left" valign="top"><input type="submit" name="set" value="{L_SET_PREFS}"></button></td>
+						</tr>
+						<!-- switch cookie_not_set off -->
+					</table>
+					</form>
+					<br>
 					</td>
 				</tr>
 			</table>
 		</td>
 	</tr>
 </table>
+
 </center>
 {FOOTER}
\ No newline at end of file
diff --git a/templates/default/search.tpl b/templates/default/search.tpl
new file mode 100644
index 0000000..bfe20eb
--- /dev/null
+++ b/templates/default/search.tpl
@@ -0,0 +1,110 @@
+{HEADER}
+<center>
+<table border="0" width="700" cellspacing="0" cellpadding="0">
+	<tr>
+		<td>
+			<table width="100%" border="0" cellspacing="0" cellpadding="0">
+				<tr>
+					<td align="left" width="120" class="navback"><a href="{BACK_PAGE}"><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="center" class="navback" nowrap valign="middle"><font class="H20">{L_RESULTS}</font></td>
+							</tr>
+						</table>
+					</td>
+					<td align="right" width="120" class="navback">	
+						<table width="120" 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>
+								<td><a class="psf" href="year.php?cal={CAL}&amp;getdate={GETDATE}"><img src="templates/{TEMPLATE}/images/year_on.gif" alt="{L_YEAR}" border="0"></a></td>
+							</tr>
+						</table>
+					</td>
+				</tr>
+			</table>
+		</td>
+	</tr>
+	<tr>
+		<td class="dayborder"><img src="images/spacer.gif" width="1" height="5" alt=" "></td>
+	</tr>
+	<tr>
+		<td align="left">
+			<div style="padding: 10px;">
+				<div align="center"><p class="V12">{L_QUERY}: {FORMATTED_SEARCH}</p></div>
+				<!-- switch results on -->
+				<font class="V12"><b><a class="ps3" href="day.php?cal={CAL}&amp;getdate={KEY}">{DAYOFMONTH}</a></b></font><br>
+				<div style="margin-left: 10px; margin-bottom: 10px;">
+					<table width="100%" border="0" cellspacing="1" cellpadding="1">
+						<tr>
+							<td width="120" 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 recur on -->
+						<tr>
+							<td valign="top" width="100" class="G10BOLD">{L_RECURRING_EVENT}:</td>
+							<td valign="top" align="left" class="G10B">{RECUR}</td>
+						</tr>
+						<!-- switch recur off -->
+						<!-- switch description on -->
+						<tr>
+							<td valign="top" width="100" class="G10BOLD">{L_DESCRIPTION}</td>
+							<td valign="top" align="left" class="G10B">{DESCRIPTION}</td>
+						</tr>
+						<!-- switch description off -->
+					</table>
+				</div>
+				<!-- switch exceptions on -->		
+				<font class="V10"><i>{L_EXCEPTION}</i>: <a class="ps3" href="day.php?cal={CAL}&amp;getdate={KEY}">{DAYOFMONTH}</a></font><br>
+				<div style="margin-left: 10px;">
+					<table width="100%" border="0" cellspacing="1" cellpadding="1">
+						<tr>
+							<td width="100" class="V10">{L_TIME}:</td>
+							<td align="left" class="V10">{EVENT_START}</td>
+						</tr>
+						<tr>
+							<td valign="top" width="100" class="V10">{L_SUMMARY}:</td>
+							<td valign="top" align="left" class="V10">{EVENT_TEXT}</td>
+						</tr>
+						<!-- switch except_recur on -->
+						<tr>
+							<td valign="top" width="100" class="V10">{L_RECURRING_EVENT}:</td>
+							<td valign="top" align="left" class="V10">{EXCEPT_RECUR}</td>
+						</tr>
+						<!-- switch except_recur off -->
+						<!-- switch except_description on -->
+						<tr>
+							<td valign="top" width="100" class="V10">{L_DESCRIPTION}:</td>
+							<td valign="top" align="left" class="V10">{EXCEPT_DESCRIPTION}</td>
+						</tr>
+						<!-- switch except_description on -->
+					</table>
+				</div>
+				<!-- switch exceptions off -->		
+				<br>
+				<!-- switch results off -->
+				
+				<!-- switch no_results on -->
+				<div align="center">
+					<p class="V12">{L_NO_RESULTS}</p>
+				</div>
+				<!-- switch no_results off -->
+				
+				<div align="center">
+					{SEARCH_BOX}
+					<p class="V9G">{L_SEARCH_TOOK} {SEARCH_TOOK)</p>
+				</div>
+				<br>
+			</div>
+		</td>
+	</tr>
+</table>
+</center>
+{FOOTER}
+