Updates and initial wiring of day.tpl and day.php.

4 files changed, 166 insertions, 341 deletions

diff --git a/day.php b/day.php
index 220903d..1be782d 100644
--- a/day.php
+++ b/day.php
@@ -9,291 +9,56 @@ if (isset($HTTP_GET_VARS['jumpto_day'])) {
 }
 define('BASE', './');
 $current_view = 'day';
-include(BASE.'functions/ical_parser.php');
+require_once(BASE.'functions/ical_parser.php');
+require_once(BASE.'functions/template.php');
 if ($minical_view == 'current') $minical_view = 'day';
 
-$starttime = '0500';
-$weekstart = 1;
-$unix_time = strtotime($getdate);
-$today_today = date('Ymd', strtotime("now + $second_offset seconds")); 
-$tomorrows_date = date( 'Ymd', strtotime('+1 day',  $unix_time));
-$yesterdays_date = date( 'Ymd', strtotime('-1 day',  $unix_time));
-$display_date = localizeDate($dateFormat_day, $unix_time);
+$weekstart 		= 1;
+$unix_time 		= strtotime($getdate);
+$today_today 	= date('Ymd', strtotime("now + $second_offset seconds")); 
+$next_day		= date('Ymd', strtotime("+1 day",  $unix_time));
+$prev_day 		= date('Ymd', strtotime("-1 day",  $unix_time));
 
-// For the side months
-ereg ('([0-9]{4})([0-9]{2})([0-9]{2})', $getdate, $day_array2);
-$this_day = $day_array2[3]; 
-$this_month = $day_array2[2];
-$this_year = $day_array2[1];
-
-$parse_month = date ('Ym', $unix_time);
-$thisday2 = localizeDate($dateFormat_week_list, $unix_time);
+$display_date = localizeDate($dateFormat_week_list, $unix_time);
 $start_week_time = strtotime(dateOfWeek($getdate, $week_start_day));
 
-$dayborder = 0;
 
-$nbrGridCols = 1;
-if (isset($master_array[($getdate)])) {
-	foreach($master_array[($getdate)] as $ovlKey => $ovlValue) {
-		if ($ovlKey != '-1') {
-			foreach($ovlValue as $ovl2Value) {
-				$nbrGridCols = kgv($nbrGridCols, ($ovl2Value['event_overlap'] + 1));
-			}
-		}
-	} 
-}
-include (BASE.'includes/header.inc.php'); 
+// select for calendars
+$list_icals 	= display_ical_list(availableCalendars($username, $password, $ALL_CALENDARS_COMBINED));
+$list_years 	= list_years();
+$list_months 	= list_months();
+$list_weeks 	= list_weeks();
+
+$page = new Page(BASE.'templates/'.$template.'/DAY.tpl');
 
-?>
-<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>
-      				<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="40%" class="navback"><?php echo '<a class="psf" href="day.php?cal='.$cal.'&amp;getdate='.$yesterdays_date.'"><img src="styles/'.$style_sheet.'/left_day.gif" alt="['.$last_day_lang.']" border="0" align="right"></a>'; ?></td>
-								<td align="center" width="20%" class="navback" nowrap valign="middle"><font class="H20"><?php echo $display_date; ?></font></td>
-      							<td align="left" width="40%" class="navback"><?php echo '<a class="psf" href="day.php?cal='.$cal.'&amp;getdate='.$tomorrows_date.'"><img src="styles/'.$style_sheet.'/right_day.gif" alt="['.$next_day_lang.']" 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>
-								<td><?php echo '<a class="psf" href="day.php?cal='.$cal.'&amp;getdate='.$getdate.'"><img src="styles/'.$style_sheet.'/day_on.gif" alt="'.$day_view_lang.'" border="0"></a></td>'; ?>
-								<td><?php echo '<a class="psf" href="week.php?cal='.$cal.'&amp;getdate='.$getdate.'"><img src="styles/'.$style_sheet.'/week_on.gif" alt="'.$week_view_lang.'" border="0"></a></td>'; ?>
-								<td><?php echo '<a class="psf" href="month.php?cal='.$cal.'&amp;getdate='.$getdate.'"><img src="styles/'.$style_sheet.'/month_on.gif" alt="'.$month_view_lang.'" border="0"></a></td>'; ?>
-								<td><?php echo '<a class="psf" href="year.php?cal='.$cal.'&amp;getdate='.$getdate.'"><img src="styles/'.$style_sheet.'/year_on.gif" alt="'.$year_view_lang.'" border="0"></a></td>'; ?>
-							</tr>
-						</table>
-					</td>
-      			</tr>
-      		</table>
-      	</td>
-	</tr>
-	<tr>
-		<td>
-      		<table width="100%" border="0" cellspacing="0" cellpadding="0" class="G10B">	
-				<?php
-					// The all day events returned here.
-					if (isset($master_array[($getdate)]['-1'])) {
-					   echo "<tr>\n";
-					   echo '<td colspan="3" height="24">'."\n";
-					   echo '<table width="100%" border="0" cellspacing="1" cellpadding="4">'."\n";
-					   foreach($master_array[($getdate)]['-1'] as $allday) {
-						 echo "<tr>\n";
-						 $event_calno  = $allday['calnumber'];
-						 $event_calna  = $allday['calname'];
-						 $event_url	   = $allday['url'];
-						 if ($event_calno < 1) $event_calno=1;
-						 if ($event_calno > 7) $event_calno=7;
-						 echo '<td valign="top" align="center" class="eventbg_'.$event_calno.'">';
-						 openevent($event_calna, '', '', $allday, 0, '', '<font color="#ffffff"><i>', '</i></font>', 'psf', $url);
-						 echo "</td>\n</tr>\n";
-					   }
-					   echo '</table>'."\n";
-					   echo '</td>'."\n";
-					   echo '</tr>'."\n";
-					}
-					if ($daysofweek_dayview == 'yes') {
-				?>
+$page->replace_tags(array(
+	'header'			=> BASE.'templates/'.$template.'/header.tpl',
+	'footer'			=> BASE.'templates/'.$template.'/footer.tpl',
+	'sidebar'			=> BASE.'templates/'.$template.'/sidebar.tpl',
+	'event_js'			=> BASE.'functions/event.js',
+	'template'			=> $template,
+	'cal'				=> $cal,
+	'getdate'			=> $getdate,
+	'calendar_name'		=> $calendar_name,
+	'display_date'		=> $display_date,
+	'rss_powered'	 	=> $rss_powered,
+	'rss_available' 	=> '',
+	'rss_valid' 		=> '',
+	'todo_js' 			=> '',
+	'show_search' 		=> '',
+	'next_day' 			=> $next_day,
+	'prev_day'	 		=> $prev_day,
+	'show_goto' 		=> '',
+	'is_logged_in' 		=> '',
+	'list_icals' 		=> $list_icals,
+	'list_years' 		=> $list_years,
+	'list_months' 		=> $list_months,
+	'list_weeks' 		=> $list_weeks,
+	'style_select' 		=> $style_select			
+	));
+	
+$page->monthbottom($this->page);
 
-		<tr>	
-			<td>
-      			<table width="100%" border="0" cellspacing="0" cellpadding="0">
-      			<?php
-      				echo '<tr><td colspan="7"><img src="images/spacer.gif" width="70" height="1" alt=" "></td></tr>';
-					echo "<tr>";
-					$thisdate = $start_week_time;
-					$start_day = strtotime($week_start_day);
-					$i = 0;
-					do {
-						$day_num = date("w", $start_day);
-						$day = $daysofweek_lang[$day_num];
-						$thisday = date("Ymd", $thisdate);
-						echo "<td width=\"74\" valign=\"top\" align=\"center\" class=\"dateback\">\n";
-						echo "<font class=\"V9\"><a class=\"psf\" href=\"day.php?cal=$cal&amp;getdate=$thisday\">$day</a></font>\n";
-						echo "</td>\n";
-						$start_day = strtotime("+1 day", $start_day);
-						$thisdate = strtotime("+1 day", $thisdate);
-						$i++;
-					} while ($i < 7);
-					echo '</tr>';			
-		      		echo '</table>';
-      				echo '</td>';
-      				echo '</tr>';
-      				}
-      				?>
-      			
-      			<tr>
-					<td align="center" valign="top" colspan="3">
-						<table width="100%" border="0" cellspacing="0" cellpadding="0">
-							<tr>
-								<td width="60"><img src="images/spacer.gif" width="60" height="1" alt=" "></td>
-								<td width="1"></td>
-								<?php for ($m=0;$m < $nbrGridCols;$m++) { 
-									echo '<td><img src="images/spacer.gif" width="' . (520 / $nbrGridCols) . '" height="1" alt=" "></td>';
-								} ?>
-							</tr>
-							<?php
-								// $master_array[($getdate)][$day_time]
-								$event_length = array ();
-								$border = 0;
-								foreach ($day_array as $key) {
-									ereg('([0-9]{2})([0-9]{2})', $key, $regs_tmp);
-									$cal_time = $key;
-									$key = mktime($regs_tmp[1],$regs_tmp[2],0,$this_month,$this_day,$this_year);
-									$key = date ($timeFormat, $key);
-									unset($this_time_arr);
-									
-									// add events that overlap the start time
-									if (isset($master_array[$getdate][$cal_time]) && sizeof($master_array[$getdate][$cal_time]) > 0) {
-										$this_time_arr = $master_array[$getdate][$cal_time];
-									}
-									
-									// add events that overlap $day_start instead of cutting them out completely
-									if ("$day_start" == "$cal_time" && isset($master_array[$getdate])) {
-										foreach($master_array[$getdate] as $time_key => $time_arr) {
-											if ((int)$time_key < (int)$cal_time && is_array($time_arr) && $time_key != '-1') {
-												foreach($time_arr as $event_tmp) {
-													if ((int)$event_tmp['event_end'] > (int)$cal_time) {
-														$this_time_arr[] = $event_tmp;
-													}
-												}
-											} else {
-												break;
-											}
-										}
-									}																		
-									
-									// check for eventstart 
-									if (isset($this_time_arr) && sizeof($this_time_arr) > 0) {
-										foreach ($this_time_arr as $eventKey => $loopevent) {
-											$drawEvent = drawEventTimes ($cal_time, $loopevent['event_end']);
-											$j = 0;
-											while (isset($event_length[$j])) {
-												if ($event_length[$j]['state'] == 'ended') {
-													$event_length[$j] = array ('length' => ($drawEvent['draw_length'] / $gridLength), 'key' => $eventKey, 'overlap' => $loopevent['event_overlap'],'state' => 'begin');
-													break;
-												}
-												$j++;
-											}
-											if ($j == sizeof($event_length)) {
-												array_push ($event_length, array ('length' => ($drawEvent['draw_length'] / $gridLength), 'key' => $eventKey, 'overlap' => $loopevent['event_overlap'],'state' => 'begin'));
-											}
-										}
-									}
-									if (ereg('([0-9]{1,2}):00', $key)) {
-										echo '<tr>'."\n";
-										echo '<td rowspan="' . (60 / $gridLength) . '" align="center" valign="top" width="60" class="timeborder">'.$key.'</td>'."\n";
-										echo '<td width="1" height="' . $gridLength . '"></td>'."\n";
-									} elseif("$cal_time" == "$day_start") {
-										$size_tmp = 60 - (int)substr($cal_time,2,2);
-										echo "<tr>\n";
-										echo "<td rowspan=\"" . ($size_tmp / $gridLength) . "\" align=\"center\" valign=\"top\" width=\"60\" class=\"timeborder\">$key</td>\n";
-										echo "<td width=\"1\" height=\"" . $gridLength . "\"></td>\n";
-									} else {
-										echo '<tr>'."\n";
-										echo '<td width="1" height="' . $gridLength . '"></td>'."\n";
-									}
-									if ($dayborder == 0) {
-										$class = ' class="dayborder"';
-										$dayborder++;
-									} else {
-										$class = ' class="dayborder2"';
-										$dayborder = 0;
-									}
-									if (sizeof($event_length) == 0) {
-										echo '<td bgcolor="#ffffff" colspan="' . $nbrGridCols . '" '.$class.'>&nbsp;</td>'."\n";
-										
-									} else {
-										$emptyWidth = $nbrGridCols;
-										for ($i=0;$i<sizeof($event_length);$i++) {
-											$drawWidth = $nbrGridCols / ($event_length[$i]['overlap'] + 1);
-											$emptyWidth = $emptyWidth - $drawWidth;
-											switch ($event_length[$i]['state']) {
-												case 'begin':
-												  $event_length[$i]['state'] = 'started';
-												  $event_start 	= $this_time_arr[($event_length[$i]['key'])]['start_unixtime'];
-												  $event_end	= strtotime ($this_time_arr[($event_length[$i]['key'])]['event_end']);
-												  if (isset($this_time_arr[($event_length[$i]['key'])]['display_end'])) $event_end = strtotime ($this_time_arr[($event_length[$i]['key'])]['display_end']);
-												  $event_start 	= date ($timeFormat, $event_start);
-												  $event_end	= date ($timeFormat, $event_end);
-												  $event_calno  = $this_time_arr[($event_length[$i]['key'])]['calnumber'];
-												  $event_status = strtolower($this_time_arr[($event_length[$i]['key'])]['status']);
-												  if ($event_calno < 1) $event_calno = 1;
-												  if ($event_calno > 7) $event_calno = 7;
-								
-												  echo '<td rowspan="' . $event_length[$i]['length'] . '" colspan="' . $drawWidth . '" align="left" valign="top" class="eventbg2_'.$event_calno.'">'."\n";
-												  echo '<table width="100%" border="0" cellspacing="0" cellpadding="2">'."\n";
-												  echo '<tr>'."\n";
-												  echo '<td class="eventborder"><font class="eventfont"><b>'.$event_start.'</b> - '.$event_end.'</font></td>'."\n";
-												  if ($event_status != '') {
-												  	echo '<td class="eventborder" width="9" align="right" valign="center"><font class="eventfont">';
-												  	echo '<img src="images/'.$event_status.'.gif" width="9" height="9" alt="" border="0" hspace="0" vspace="0">';
-												  	echo '</font></td>'."\n";
-												  }
-												  echo '</tr>'."\n";
-												  echo '<tr>'."\n";
-												  echo '<td colspan="2">'."\n";
-												  echo '<table width="100%" border="0" cellpadding="1" cellspacing="0">'."\n";
-												  echo '<tr>'."\n";
-												  echo '<td class="eventbg_'.$event_calno.'">';
-												  $event_calna 	= $this_time_arr[($event_length[$i]['key'])]['calname'];
-												  $event_url 	= $this_time_arr[($event_length[$i]['key'])]['url'];
-										  		  openevent($event_calna, $event_start, $event_end, $this_time_arr[($event_length[$i]['key'])], '', 0, '<font class="eventfont">', '</font>', 'psf', $event_url);
-												  echo '</td></tr>'."\n";
-												  echo '</table>'."\n";
-												  echo '</td>'."\n";           
-												  echo '</tr>'."\n";
-												  echo '</table>'."\n";
-												  echo '</td>'."\n";
-												  break;
-												case 'started':
-													break;
-												case 'ended':
-													echo '<td bgcolor="#ffffff" colspan="' . $drawWidth . '" ' . $class . '>&nbsp;</td>'."\n";
-													break;
-											}
-											$event_length[$i]['length']--;
-											if ($event_length[$i]['length'] == 0) {
-												$event_length[$i]['state'] = 'ended';
-											}
-										}
-										//fill emtpy space on the right
-										if ($emptyWidth > 0) {
-											echo '<td bgcolor="#ffffff" colspan="' . $emptyWidth . '" ' . $class . '>&nbsp;</td>'."\n";
-										}
-										while (isset($event_length[(sizeof($event_length) - 1)]) && $event_length[(sizeof($event_length) - 1)]['state'] == 'ended') {
-											array_pop($event_length);
-										}
-										
-									}
-									echo '</tr>'."\n";
-								}
-								
-							?>
-					</table>
-        		</td>
-       		</tr>
-        	</table>
-    	</td>
-	</tr>
-</table>
-</td>
-		<td width="10"><img src="images/spacer.gif" width="10" height="1" alt=" "></td>
-		<td width="170" valign="top">
-			<?php include (BASE.'includes/sidebar.php'); ?>
-		</td>
-	</tr>
-</table>
-</center>
-<?php include (BASE.'includes/footer.inc.php'); ?>
+$page->output();
 
+?>
\ No newline at end of file
diff --git a/month.php b/month.php
index 2ae91a5..0a9c200 100644
--- a/month.php
+++ b/month.php
@@ -12,8 +12,8 @@ $this_year 				= $day_array2[1];
 
 $unix_time 				= strtotime($getdate);
 $today_today 			= date('Ymd', strtotime("now + $second_offset seconds")); 
-$tomorrows_date 		= date( "Ymd", strtotime("+1 day",  $unix_time));
-$yesterdays_date 		= date( "Ymd", strtotime("-1 day",  $unix_time));
+$tomorrows_date 		= date('Ymd', strtotime("+1 day",  $unix_time));
+$yesterdays_date 		= date('Ymd', strtotime("-1 day",  $unix_time));
 
 // find out next month
 $next_month_month 		= ($this_month+1 == '13') ? '1' : ($this_month+1);
diff --git a/templates/default/day.tpl b/templates/default/day.tpl
index 40415ce..a3ad977 100644
--- a/templates/default/day.tpl
+++ b/templates/default/day.tpl
@@ -34,21 +34,14 @@
 				</tr>
 				<tr>
 					<td>
-						<table width="100%" border="0" cellspacing="0" cellpadding="0" class="G10B">	
-							<!-- loop allday on -->
-							<tr>
-								<td height="24">
-									<table width="100%" border="0" cellspacing="1" cellpadding="4">
-										<tr>
-											<td valign="top" align="center" class="eventbg_{EVENT_CALNO}">
-												<font color="#ffffff"><i>{EVENT}</i></font>
-											</td>
-										</tr>
-									</table>
-								</td>
-							</tr>
-							<!-- loop allday off -->
-						</table>
+						<!-- loop allday on -->
+						<div style="height: 18px; padding-top: 4px; border: 1px solid #fff;" class="eventbg_1">
+							<center><font class="V10W">{ALLDAY}</font></center>
+						</div>
+						<div style="height: 18px; padding-top: 4px; border: 1px solid #fff;" class="eventbg_1">
+							<center><font class="V10W">{ALLDAY}</font></center>
+						</div>
+						<!-- loop allday off -->
 					</td>
 				</tr>
 				<!-- switch showdays on -->
@@ -62,6 +55,24 @@
 								<td width="74" valign="top" align="center" class="dateback">
 									<font class="V9"><a class="psf" href="day.php?cal={CAL}&amp;getdate={THISDAY}">{DAY}</a></font>
 								</td>
+								<td width="74" valign="top" align="center" class="dateback">
+									<font class="V9"><a class="psf" href="day.php?cal={CAL}&amp;getdate={THISDAY}">{DAY}</a></font>
+								</td>
+								<td width="74" valign="top" align="center" class="dateback">
+									<font class="V9"><a class="psf" href="day.php?cal={CAL}&amp;getdate={THISDAY}">{DAY}</a></font>
+								</td>
+								<td width="74" valign="top" align="center" class="dateback">
+									<font class="V9"><a class="psf" href="day.php?cal={CAL}&amp;getdate={THISDAY}">{DAY}</a></font>
+								</td>
+								<td width="74" valign="top" align="center" class="dateback">
+									<font class="V9"><a class="psf" href="day.php?cal={CAL}&amp;getdate={THISDAY}">{DAY}</a></font>
+								</td>
+								<td width="74" valign="top" align="center" class="dateback">
+									<font class="V9"><a class="psf" href="day.php?cal={CAL}&amp;getdate={THISDAY}">{DAY}</a></font>
+								</td>
+								<td width="74" valign="top" align="center" class="dateback">
+									<font class="V9"><a class="psf" href="day.php?cal={CAL}&amp;getdate={THISDAY}">{DAY}</a></font>
+								</td>
 							</tr>	
 						</table>
 					</td>
@@ -70,56 +81,55 @@
       			<tr>
 					<td align="center" valign="top" colspan="3">
 						<table width="100%" border="0" cellspacing="0" cellpadding="0">
+							<!-- loop row on -->
 							<tr>
-								<td width="60"><img src="images/spacer.gif" width="60" height="1" alt=" "></td>
-								<td width="1"></td>
-								<!-- loop spacer on -->
-								<td><img src="images/spacer.gif" width="{NBRGRIDCOLS_SPACE}" height="1" alt=" "></td>
-								<!-- loop spacer off -->
+								<td rowspan="4" align="center" valign="top" width="60" class="timeborder">11:00 AM</td>
+								<td width="1" height="15"></td>
+								<td class="dayborder">&nbsp;</td>
 							</tr>
-							<!-- loop row on -->
 							<tr>
-								<td rowspan="{ROWSPAN}" align="center" valign="top" width="60" class="timeborder">{TIME}</td>
-								<td width="1" height="{GRIDLENGTH}"></td>
-								<!-- switch event on -->
-								<td rowspan="6" colspan="1" align="left" valign="top" class="eventbg2_1">
-									<table width="100%" border="0" cellspacing="0" cellpadding="2">
-										<tr>
-											<td class="eventborder"><font class="eventfont"><b>{EVENT_START}</b> - {EVENT_END}</font></td>
-										</tr>
-										<tr>
-											<td colspan="2">
-												<table width="100%" border="0" cellpadding="1" cellspacing="0">
-													<tr>
-														<td class="eventbg_{CALNO}">{SUMMARY}</td>
-													</tr>
-												</table>
-											</td>
-										</tr>
-									</table>
-								</td>
-								<!-- switch event off -->
+								<td width="1" height="15"></td>
+								<td class="dayborder2">&nbsp;</td>
 							</tr>
 							<tr>
-								<td width="1" height="{GRIDLENGTH}"></td>
+								<td width="1" height="15"></td>
+								<td class="dayborder">&nbsp;</td>
 							</tr>
 							<tr>
-								<td width="1" height="{GRIDLENGTH}"></td>
+								<td width="1" height="15"></td>
+								<td class="dayborder2">&nbsp;</td>
 							</tr>
+							<!-- loop row off -->
 							<tr>
-								<td width="1" height="{GRIDLENGTH}"></td>
+								<td rowspan="4" align="center" valign="top" width="60" class="timeborder">12:00 PM</td>
+								<td width="1" height="15"></td>
+								<td class="dayborder">&nbsp;</td>
 							</tr>
 							<tr>
-							<!-- loop row off -->
+								<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>
 						</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>
-	</tr>
-</table>
-</td>
-<td width="10"><img src="images/spacer.gif" width="10" height="1" alt=" "></td>
+		<td width="10"><img src="images/spacer.gif" width="10" height="1" alt=" "></td>
 		<td width="170" valign="top">
 			{SIDEBAR}
 		</td>
diff --git a/templates/default/sidebar.tpl b/templates/default/sidebar.tpl
index a2b147f..ce32427 100644
--- a/templates/default/sidebar.tpl
+++ b/templates/default/sidebar.tpl
@@ -1,7 +1,7 @@
 <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={YESTERDAYS_DATE}"><img src="templates/{TEMPLATE}/images/left_arrows.gif" alt="{PREV_LANG}" width="16" height="20" border="0" align="left"></a></td>
-		<td align="center" width="112" class="sideback"><font class="G10BOLD">{THISDAY2}</font></td>
+		<td align="center" width="112" class="sideback"><font class="G10BOLD">{DISPLAY_DATE}</font></td>
 		<td align="right" valign="top" width="24" class="sideback"><a class="psf" href="day.php?cal={CAL}&amp;getdate={TOMORROWS_DATE}"><img src="templates/{TEMPLATE}/images/right_arrows.gif" alt="{NEXT_LANG}" width="16" height="20" border="0" align="right"></a></td>
 	</tr>
 	<tr>
@@ -18,7 +18,7 @@
 					<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}">{SUBSCRIBE_LANG}</a>&nbsp;|&nbsp;<a class="psf" href="{DOWNLOAD_FILENAME}">{DOWNLOAD_LANG}</a><br>
+					<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>
@@ -28,7 +28,15 @@
 		</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 height="20">
 		<td align="center" class="sideback"><div style="height: 20px; margin-top: 3px;" class="G10BOLD">{L_JUMP}</div></td>
@@ -36,12 +44,11 @@
 	<tr>
 		<td bgcolor="#FFFFFF" align="left">
 			<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 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_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}
@@ -57,13 +64,20 @@
 		</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 height="20">
-		<td align="center" class="sideback"><div style="height: 20px; margin-top: 3px;" class="G10BOLD">{TOMORROWS_LANG}</div></td>
+		<td align="center" class="sideback"><div style="height: 20px; margin-top: 3px;" class="G10BOLD">{L_TOMORROWS}</div></td>
 	</tr>
 	<tr>
 		<td bgcolor="#FFFFFF" align="left">
@@ -78,6 +92,13 @@
 		</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 -->
@@ -86,7 +107,7 @@
 
 <table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
 	<tr height="20">
-		<td align="center" width="98%" class="sideback"><div style="height: 20px; margin-top: 3px;" class="G10BOLD">{TODO_LANG}</div></td>
+		<td align="center" width="98%" class="sideback"><div style="height: 20px; margin-top: 3px;" class="G10BOLD">{L_TODO}</div></td>
 	</tr>
 	<tr>
 		<td bgcolor="#FFFFFF" align="left">
@@ -118,14 +139,43 @@
 		</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 todo 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}
\ No newline at end of file
+{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>
\ No newline at end of file