Work continues on month.php and templates.

3 files changed, 35 insertions, 77 deletions

diff --git a/templates/default/calendar_nav.tpl b/templates/default/calendar_nav.tpl
index 8ac5386..e0cfa47 100644
--- a/templates/default/calendar_nav.tpl
+++ b/templates/default/calendar_nav.tpl
@@ -7,25 +7,33 @@
 			<table border="0" width="330" cellspacing="0" cellpadding="0">
 				<tr>
 					<td width="160" valign="top">
-						<div style="padding: 5px;">
-							<form style="margin-bottom:0;" action="day.php" method="GET">
-								<select name="action" class="query_style" onChange="window.location=(this.options[this.selectedIndex].value">{LIST_ICALS}</select><br>
-								{LIST_YEARS}<br>
-								{LIST_MONTHS}<br>
-								{LIST_WEEKS}<br>
-								<br>
-							</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 -->
-						</div>
+						<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>
+							</tr>
+							<tr>
+								<td>
+									<div style="padding: 5px;">
+										<form style="margin-bottom:0;" action="day.php" method="GET">
+											<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>
+										</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 -->
+									</div>
+								</td>
+							</tr>
+						</table>
 					</td>
 					<td>
 						<img src="images/spacer.gif" width="20" height="1" alt=" ">
diff --git a/templates/default/default.css b/templates/default/default.css
index 876ed3e..9a1c328 100644
--- a/templates/default/default.css
+++ b/templates/default/default.css
@@ -1,5 +1,7 @@
 /* Style sheet for the silver calendar (default) */

 

+table, td {font: 11px Verdana, Arial, sans-serif; color: #000;}

+

 .eventborder	{ background-image: url(images/day_title.gif); border: 1px #006699 solid; }

 .eventbg	 	{ background-color: #6699CC; }

 

diff --git a/templates/default/month.tpl b/templates/default/month.tpl
index b0aba24..be0135c 100644
--- a/templates/default/month.tpl
+++ b/templates/default/month.tpl
@@ -10,7 +10,7 @@
 							<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="navback" nowrap valign="middle"><font class="H20">{MONTH_TITLE}</font></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="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>
@@ -22,74 +22,21 @@
 								<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>
+								</tr>
 							</table>
 						</td>
 					</tr>
 				</table>
 			</td>
-		</tr>
-		<tr>
-			<td align="center" valign="top">
-				<table width="100%" 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 height="105">
-						<!-- 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>
-							</div>
-							<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> 
-								</div>
-							</div>
-						</td>
-						<!-- switch notthismonth off -->
-						<!-- switch isevent 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>
-							</div>
-							<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> 
-								</div>
-							</div>
-						</td>
-						<!-- switch isevent off -->
-						<!-- switch notevent 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>
-							</div>
-							<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> 
-								</div>
-							</div>
-						</td>
-						<!-- switch notevent off -->
-					</tr>
-					<!-- loop monthweeks off -->
-				</table>
-			</td>
-		</tr>
+		</tr>	
 	</table>
+	{MONTH_LARGE|+0}
 	<br>
 	{CALENDAR_NAV}
 	<!-- switch showbottom on -->
 	<br>
 	<table width="737" border="0" cellspacing="0" cellpadding="3" class="calborder">
+		<!-- loop showbottomevents on -->
 		<tr>
 			<td colspan="3" align="center" class="sideback" nowrap>
 				<div style="height: 16px;" class="G10BOLD">
@@ -106,6 +53,7 @@
 				{JS_OPENEVENT}<a class="psf" href="#" onclick="openEventWindow({EVENT_NUMBER}); return false;"><font class="G10B">{EVENT_TEXT}</font></a> 
 			</td>
 		</tr>
+		<!-- loop showbottomevents off -->
 	</table>
 	<!-- switch showbottom off -->
 </center>