Tomorrow's events turn off when none are present.

2 files changed, 41 insertions, 36 deletions

diff --git a/functions/template.php b/functions/template.php
index ab0c742..6781efc 100644
--- a/functions/template.php
+++ b/functions/template.php
@@ -79,10 +79,15 @@ class Page {
 					}
 				}
 			}
-		}
 		
-		$this->page = ereg_replace('<!-- switch t_allday on -->(.*)<!-- switch t_allday off -->', $replace_ad, $this->page);
-		$this->page = ereg_replace('<!-- switch t_event on -->(.*)<!-- switch t_event off -->', $replace_e, $this->page);		
+			$this->page = ereg_replace('<!-- switch t_allday on -->(.*)<!-- switch t_allday off -->', $replace_ad, $this->page);
+			$this->page = ereg_replace('<!-- switch t_event on -->(.*)<!-- switch t_event off -->', $replace_e, $this->page);		
+	
+		} else {
+		
+			$this->page = ereg_replace('<!-- switch tomorrows_events on -->(.*)<!-- switch tomorrows_events off -->', '', $this->page);
+		
+		}
 	}
 	
 	function draw_month($template_p, $offset = '+0', $type) {
diff --git a/templates/default/sidebar.tpl b/templates/default/sidebar.tpl
index f0d64e3..4f4f22a 100644
--- a/templates/default/sidebar.tpl
+++ b/templates/default/sidebar.tpl
@@ -25,16 +25,16 @@
 </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>
+		<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>
+<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>
+	<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">
@@ -62,18 +62,18 @@
 </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>
+		<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>
+<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">{L_TOMORROWS}</div></td>
+	<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">
@@ -90,20 +90,20 @@
 </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>
+		<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>
+<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
 
 <!-- switch tomorrows_events off -->
 
 <!-- switch todo on -->
 
 <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">{L_TODO}</div></td>
+	<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">
@@ -137,12 +137,12 @@
 </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>
+		<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>
+<img src="images/spacer.gif" width="1" height="10" alt=" " /><br />
 
 
 <!-- switch todo off -->
@@ -150,28 +150,28 @@
 {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>
+		<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>
+<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>
+		<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>
+<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>
+		<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>