Continued work on week.tpl. Allday is now wired. Replaced all ereg's on

tempate with preg to increase template speed.

3 files changed, 54 insertions, 46 deletions

diff --git a/templates/default/day.tpl b/templates/default/day.tpl
index e2a3142..e2c214e 100644
--- a/templates/default/day.tpl
+++ b/templates/default/day.tpl
@@ -24,9 +24,9 @@
 							</tr>
 							<tr>	
 								<td colspan="2">
-									<table width="100%" border="0" cellspacing="1" cellpadding="2">
+									<table width="100%" border="0" cellspacing="0" cellpadding="2">
 										<tr>
-											<td align="left" valign="top" width="20" class="rowOff" onmouseover="this.className='rowOn'" onmouseout="this.className='rowOff'" onclick="window.location.href='day.php?cal={CAL}&amp;getdate={PREV_DAY}'">
+											<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 -->
diff --git a/templates/default/default.css b/templates/default/default.css
index 63b499d..40e7afe 100644
--- a/templates/default/default.css
+++ b/templates/default/default.css
@@ -15,9 +15,11 @@ table, td {font: 11px Verdana, Arial, sans-serif; color: #000;}
 .alldaybg_6 {background: url(images/allday_6.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;}

 .alldaybg_7 {background: url(images/allday_7.gif) repeat-x; height: 19px; padding-top: 5px; text-align: center;}

 

-.rowOn			{ background-color: #cfc; }

-.rowOff			{ background-color: #E1E8F1; }

-.rowToday		{ background-color: #cff; }

+.rowOn			{ background-color: #cfc; border-top: 1px solid #fff; border-left: 1px solid #fff; }

+.rowOn2			{ background-color: #cfc; border-top: 1px solid #fff; }

+.rowOff			{ background-color: #E1E8F1; border-top: 1px solid #fff; border-left: 1px solid #fff; }

+.rowOff2		{ background-color: #E1E8F1; border-top: 1px solid #fff; border-left: }

+.rowToday		{ background-color: #cff; border-top: 1px solid #fff; border-left: 1px solid #fff; }

 

 

 

@@ -92,7 +94,7 @@ a.ps3			{ text-decoration:	none; }
 a.ps3:link		{ color: #000000; background-color: transparent; }

 a.ps3:visited	{ color: #000000; background-color: transparent; }

 a.ps3:active	{ color: #000000; background-color: transparent; }

-a.ps3:hover		{ color: #000000; background-color: transparent; text-decoration:	underline;}

+a.ps3:hover		{ color: #000000; background-color: transparent; }

 	

 /* Body attributes */

 

diff --git a/templates/default/week.tpl b/templates/default/week.tpl
index 3fa2114..3d9eba7 100644
--- a/templates/default/week.tpl
+++ b/templates/default/week.tpl
@@ -30,124 +30,130 @@
 							<table width="100%" border="0" cellspacing="0" cellpadding="0" class="G10B">
 								<tr>
 									<td align="center" valign="top">
-										<table width="100%" border="0" cellspacing="0" cellpadding="2">
+										<table width="100%" border="0" cellspacing="0" cellpadding="0">
 											<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">&nbsp;&nbsp;<a class="psf" href="week.php?cal={CAL}&amp;getdate={PREV_WEEK}">&laquo;</a></span>
+												<td align="left" valign="top" width="15" class="rowOff2" onmouseover="this.className='rowOn2'" onmouseout="this.className='rowOff2'" onclick="window.location.href='week.php?cal={CAL}&amp;getdate={PREV_WEEK}'">
+													<div class="V12">&nbsp;<a class="psf" href="week.php?cal={CAL}&amp;getdate={PREV_WEEK}">&laquo;</a></div>
 												</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>&nbsp;&nbsp;</span>
+												<td align="left" valign="top" width="15" class="rowOff" onmouseover="this.className='rowOn'" onmouseout="this.className='rowOff'" onclick="window.location.href='week.php?cal={CAL}&amp;getdate={PREV_DAY}'">
+													<div class="V12">&nbsp;<a class="psf" href="week.php?cal={CAL}&amp;getdate={PREV_DAY}">&lsaquo;</a></div>
+												</td>
+												<td align="right" valign="top" width="15" class="rowOff" onmouseover="this.className='rowOn'" onmouseout="this.className='rowOff'" onclick="window.location.href='week.php?cal={CAL}&amp;getdate={NEXT_DAY}'">
+													<div class="V12"><a class="psf" href="week.php?cal={CAL}&amp;getdate={NEXT_DAY}">&rsaquo;</a>&nbsp;</div>
+												</td>
+												<td align="right" valign="top" width="15" class="rowOff" onmouseover="this.className='rowOn'" onmouseout="this.className='rowOff'" onclick="window.location.href='week.php?cal={CAL}&amp;getdate={NEXT_WEEK}'">
+													<div class="V12"><a class="psf" href="week.php?cal={CAL}&amp;getdate={NEXT_WEEK}">&raquo;</a>&nbsp;</div>
 												</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}'">
-													<a class="psf" href="day.php?cal={CAL}&amp;getdate={DAYLINK}"><span class="V9">{DAY}</span></a> 
+												<td width="80" align="center" class="{ROW1}" onmouseover="this.className='{ROW2}'" onmouseout="this.className='{ROW3}'" onclick="window.location.href='week.php?cal={CAL}&amp;getdate={DAYLINK}'">
+													<a class="ps3" href="week.php?cal={CAL}&amp;getdate={DAYLINK}"><span class="V9BOLD">{DAY}</span></a> 
 												</td>
 												<!-- loop daysofweek off -->
 											</tr>
-											<tr>
-												<td width="60" class="rowOff" colspan="2">
+											<tr valign="top">
+												<td width="60" class="rowOff2" colspan="4">
 												<!-- loop alldaysofweek on -->
-												<td>
+												<td width="80" class="rowOff">
 													<!-- loop allday on -->
 													<div class="alldaybg_{CALNO}">
-														{EVENT}
+														<b>{EVENT}</b>
 													</div>
 													<!-- loop allday off -->
 												</td>
 												<!-- loop alldaysofweek off -->
 											</tr>
 											<tr>
-												<td rowspan="4" align="center" valign="top" width="60" class="timeborder" colspan="2">
+												<td colspan="4" rowspan="4" align="center" valign="top" width="60" class="timeborder">
 													8:00 AM
 												</td>
-												<td bgcolor="#ffffff" colspan="1" class="weekborder">
+												<td width="80" colspan="1" class="weekborder">
 													&nbsp;
 												</td>
-												<td bgcolor="#ffffff" colspan="1" class="weekborder">
+												<td width="80" colspan="1" class="weekborder">
 													&nbsp;
 												</td>
-												<td bgcolor="#ffffff" colspan="1" class="weekborder">
+												<td width="80" colspan="1" class="weekborder">
 													&nbsp;
 												</td>
-												<td bgcolor="#ffffff" colspan="1" class="weekborder">
+												<td width="80" colspan="1" class="weekborder">
 													&nbsp;
 												</td>
-												<td bgcolor="#ffffff" colspan="1" class="weekborder">
+												<td width="80"colspan="1" class="weekborder">
 													&nbsp;
 												</td>
-												<td bgcolor="#ffffff" colspan="1" class="weekborder">
+												<td width="80"colspan="1" class="weekborder">
 													&nbsp;
 												</td>
-												<td bgcolor="#ffffff" colspan="1" class="weekborder">
+												<td width="80"colspan="1" class="weekborder">
 													&nbsp;
 												</td>
 											</tr>
 											<tr>
-												<td bgcolor="#ffffff" colspan="1" class="weekborder">
+												<td width="80"colspan="1" class="weekborder">
 													&nbsp;
 												</td>
-												<td bgcolor="#ffffff" colspan="1" class="weekborder">
+												<td width="80"colspan="1" class="weekborder">
 													&nbsp;
 												</td>
-												<td bgcolor="#ffffff" colspan="1" class="weekborder">
+												<td width="80"colspan="1" class="weekborder">
 													&nbsp;
 												</td>
-												<td bgcolor="#ffffff" colspan="1" class="weekborder">
+												<td width="80"colspan="1" class="weekborder">
 													&nbsp;
 												</td>
-												<td bgcolor="#ffffff" colspan="1" class="weekborder">
+												<td width="80"colspan="1" class="weekborder">
 													&nbsp;
 												</td>
-												<td bgcolor="#ffffff" colspan="1" class="weekborder">
+												<td width="80"colspan="1" class="weekborder">
 													&nbsp;
 												</td>
-												<td bgcolor="#ffffff" colspan="1" class="weekborder">
+												<td width="80"colspan="1" class="weekborder">
 													&nbsp;
 												</td>
 											</tr>
 											<tr>
-												<td bgcolor="#ffffff" colspan="1" class="weekborder">
+												<td width="80"colspan="1" class="weekborder">
 													&nbsp;
 												</td>
-												<td bgcolor="#ffffff" colspan="1" class="weekborder">
+												<td width="80"colspan="1" class="weekborder">
 													&nbsp;
 												</td>
-												<td bgcolor="#ffffff" colspan="1" class="weekborder">
+												<td width="80"colspan="1" class="weekborder">
 													&nbsp;
 												</td>
-												<td bgcolor="#ffffff" colspan="1" class="weekborder">
+												<td width="80"colspan="1" class="weekborder">
 													&nbsp;
 												</td>
-												<td bgcolor="#ffffff" colspan="1" class="weekborder">
+												<td width="80"colspan="1" class="weekborder">
 													&nbsp;
 												</td>
-												<td bgcolor="#ffffff" colspan="1" class="weekborder">
+												<td width="80"colspan="1" class="weekborder">
 													&nbsp;
 												</td>
-												<td bgcolor="#ffffff" colspan="1" class="weekborder">
+												<td width="80"colspan="1" class="weekborder">
 													&nbsp;
 												</td>
 											</tr>
 											<tr>
-												<td bgcolor="#ffffff" colspan="1" class="weekborder">
+												<td width="80"colspan="1" class="weekborder">
 													&nbsp;
 												</td>
-												<td bgcolor="#ffffff" colspan="1" class="weekborder">
+												<td width="80"colspan="1" class="weekborder">
 													&nbsp;
 												</td>
-												<td bgcolor="#ffffff" colspan="1" class="weekborder">
+												<td width="80"colspan="1" class="weekborder">
 													&nbsp;
 												</td>
-												<td bgcolor="#ffffff" colspan="1" class="weekborder">
+												<td width="80"colspan="1" class="weekborder">
 													&nbsp;
 												</td>
-												<td bgcolor="#ffffff" colspan="1" class="weekborder">
+												<td width="80"colspan="1" class="weekborder">
 													&nbsp;
 												</td>
-												<td bgcolor="#ffffff" colspan="1" class="weekborder">
+												<td width="80"colspan="1" class="weekborder">
 													&nbsp;
 												</td>
-												<td bgcolor="#ffffff" colspan="1" class="weekborder">
+												<td width="80"colspan="1" class="weekborder">
 													&nbsp;
 												</td>
 											</tr>