More lang support, cleaned up month_bottom.php

3 files changed, 70 insertions, 67 deletions

diff --git a/languages/english.inc.php b/languages/english.inc.php
index f49cfe7..904ce4a 100644
--- a/languages/english.inc.php
+++ b/languages/english.inc.php
@@ -40,6 +40,10 @@ $this_week_lang		= "This Week";
 $this_month_lang	= "This Month";
 $jump_lang			= "Jump to";
 $tomorrows_lang		= "Tomorrow's Events";
+$goday_lang			= "Go to Today";
+$goweek_lang		= "Go to This Week";
+$gomonth_lang		= "Go to This Month";
+$goyear_lang		= "Go to This Year";
 
 // Date display since setlocale isnt perfect.
 $daysofweek_lang			= array ("Sunday","Monday","Tuesday","Wednesday","Thursday","Friday","Saturday");
diff --git a/month_bottom.php b/month_bottom.php
index 0e9cac8..6e551c3 100644
--- a/month_bottom.php
+++ b/month_bottom.php
@@ -8,17 +8,25 @@
 	
 	?>
 <br>
-<table border="0" width="737" cellspacing="0" cellpadding="0">
+<table border="0" width="737" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF" class="calborder">
+	<tr>
+											<td align="left" valign="top" bgcolor="#DDDDDD" width="1%" background="images/side_bg.gif"><?php echo "<a class=\"psf\" href=\"day.php?cal=$cal&getdate=$yesterdays_date\"><img src=\"images/left_arrows.gif\" alt=\"right\" width=\"16\" height=\"20\" border=\"0\" align=\"left\"></a>"; ?></td>
+		<td bgcolor="#DDDDDD" align="center" class="G10B" background="images/side_bg.gif"><b><?php print (strftime ($dateFormat_day, strtotime($getdate))); ?></b></td>
+											<td align="right" valign="top" bgcolor="#DDDDDD" width="1%" background="images/side_bg.gif"><?php echo "<a class=\"psf\" href=\"day.php?cal=$cal&getdate=$tomorrows_date\"><img src=\"images/right_arrows.gif\" alt=\"right\" width=\"16\" height=\"20\" border=\"0\" align=\"right\"></a>"; ?></td>
+	</tr>
+	<tr>
+		<td colspan="3"><img src="images/spacer.gif" width="1" height="5"></td>
+	</tr>
 	<tr>
 		<td width="1%" valign="top" align="right">
 			<table cellpadding="0" cellspacing="0" border="0" width="160">
 				<tr>
 					<td valign="center" align="center">
-						<table width="160" border="0" cellpadding="0" cellspacing="0" class="calborder">
+						<table width="160" border="0" cellpadding="0" cellspacing="0">
 							<tr>
-								<td align="left" valign="top" bgcolor="#DDDDDD" width="1" background="images/side_bg.gif"><img src="images/spacer.gif" width="1" height="20"></td>
-								<td bgcolor="#DDDDDD" align="center" class="G10B" background="images/side_bg.gif"><b><?php print (strftime ($dateFormat_month, strtotime("-1 month", strtotime($getdate)))); ?></b></td>
-								<td align="right" valign="top" bgcolor="#DDDDDD" width="1" background="images/side_bg.gif"></td>
+								<td align="left" valign="top" width="1"><img src="images/spacer.gif" width="1" height="20"></td>
+								<td align="center" class="G10B"><b><?php print (strftime ($dateFormat_month, strtotime("-1 month", strtotime($getdate)))); ?></b></td>
+								<td align="right" valign="top" width="1"></td>
 							</tr>
 							<tr>
 								<td colspan="3" bgcolor="#FFFFFF" align="center">
@@ -91,65 +99,58 @@
 				</tr>
 			</table>
 		</td>
-		<td width="98% valign="top" align="center">
+		<td width="98%" valign="top" align="center">
 			<table border="0" width="330" cellspacing="0" cellpadding="0">
 				<tr>
 					<td width="160" valign="top">
 						<table cellpadding="0" cellspacing="0" border="0" width="160">
 							<tr>
-								<td valign="center" align="left">
-									<table width="160" border="0" cellpadding="0" cellspacing="0" class="calborder">
-										<tr>
-											<td align="left" valign="top" bgcolor="#DDDDDD" width="1%" background="images/side_bg.gif"><?php echo "<a class=\"psf\" href=\"day.php?cal=$cal&getdate=$yesterdays_date\"><img src=\"images/left_arrows.gif\" alt=\"right\" width=\"16\" height=\"20\" border=\"0\" align=\"left\"></a>"; ?></td>
-											<td bgcolor="#DDDDDD" align="center" class="G10B" width="98%" background="images/side_bg.gif"><b><?php echo "$thisday2"; ?></b></td>
-											<td align="right" valign="top" bgcolor="#DDDDDD" width="1%" background="images/side_bg.gif"><?php echo "<a class=\"psf\" href=\"day.php?cal=$cal&getdate=$tomorrows_date\"><img src=\"images/right_arrows.gif\" alt=\"right\" width=\"16\" height=\"20\" border=\"0\" align=\"right\"></a>"; ?></td>
-										</tr>
+								<td valign="center" align="center">
+									<table width="160" border="0" cellpadding="0" cellspacing="0">
 										<tr>
 											<td colspan="3" bgcolor="#FFFFFF" align="center">
 												<table border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF" width="100%">
 													<tr>
-														<td colspan="7"><img src="images/spacer.gif" width="21" height="6"></td>
-													</tr>
-													<tr>
 														<td width="1%"><img src="images/spacer.gif" width="4" height="1"></td>
-														<td colspan="6" class="G10B"><b><?php echo "$cal_displayname2"; ?></b></td>
+														<td colspan="6" class="G10B"><b><?php echo "$jump_lang"; ?></b></td>
 													</tr>
 													<tr>
 														<td colspan="7"><img src="images/spacer.gif" width="21" height="3"></td>
 													</tr>
 													<tr>
 														<td width="1%"><img src="images/spacer.gif" width="4" height="1"></td>
-														<td colspan="6" class="G10B"><?php echo "<a class=\"psf\" href=\"day.php?cal=$cal&getdate=$today_today\">Go to Today</a>"; ?></td>
-													</tr>
-													<tr>
-														<td colspan="7"><img src="images/spacer.gif" width="21" height="1"></td>
-													</tr>
-													<tr>
-														<td width="1%"><img src="images/spacer.gif" width="4" height="1"></td>
-														<td colspan="6" class="G10B"><?php echo "<a class=\"psf\" href=\"week.php?cal=$cal&getdate=$today_today\">Go to This Week</a>"; ?></td>
+														<td colspan="6" class="G10B"><?php include('./functions/list_icals.php'); ?></td>
 													</tr>
 													<tr>
-														<td colspan="7"><img src="images/spacer.gif" width="21" height="1"></td>
+														<td colspan="7"><img src="images/spacer.gif" width="21" height="5"></td>
 													</tr>
 													<tr>
 														<td width="1%"><img src="images/spacer.gif" width="4" height="1"></td>
-														<td colspan="6" class="G10B"><?php echo "<a class=\"psf\" href=\"month.php?cal=$cal&getdate=$today_today\">Go to This Month</a>"; ?></td>
+														<td colspan="6" class="G10B"><?php include('./functions/list_months.php'); ?></td>
 													</tr>
 													<tr>
 														<td colspan="7"><img src="images/spacer.gif" width="21" height="5"></td>
 													</tr>
 													<tr>
 														<td width="1%"><img src="images/spacer.gif" width="4" height="1"></td>
-														<td width="1%" align="middle"><?php echo "<a class=\"psf\" href=\"$fullpath$cal.ics\"><img src=\"images/smallicon.gif\" alt=\"\" width=\"13\" height=\"16\" border=\"0\" align=\"middle\"></a>"; ?></td>
-														<td width="1%"><img src="images/spacer.gif" width="3" height="1"></td>
-														<td colspan="4" class="G10B"><?php echo "<a class=\"psf\" href=\"$fullpath$cal.ics\">$subscribe_lang</a>"; ?></td>
+														<td colspan="6" class="G10B"><?php include('./functions/list_weeks.php'); ?></td>
 													</tr>
+													<?php
+													if ($display_custom_goto == "yes") {
+													?>
 													<tr>
 														<td width="1%"><img src="images/spacer.gif" width="4" height="1"></td>
-														<td width="1%" align="middle"><?php echo "<a class=\"psf\" href=\"$filename\"><img src=\"images/download_arrow.gif\" alt=\"\" width=\"13\" height=\"16\" border=\"0\" align=\"middle\"></a>"; ?></td>
-														<td width="1%"><img src="images/spacer.gif" width="3" height="1"></td>
-														<td colspan="4" class="G10B"><?php echo "<a class=\"psf\" href=\"$filename\">$download_lang</a>"; ?></td>
+														<td colspan="6" class="G10B">
+															<form action="day.php" method="GET">
+																<input type="hidden" name="cal" value="<?php print urlencode($cal); ?>">
+																<input type="text" size="15" name="jumpto_day">
+																<input type="submit" value="Go">
+															</form>
+														</td>
 													</tr>
+													<?php
+													}
+													?>
 												</table>
 											</td>
 										</tr>
@@ -165,53 +166,51 @@
 					<td width="160" valign="top">
 						<table cellpadding="0" cellspacing="0" border="0" width="160">
 							<tr>
-								<td valign="center" align="center">
-									<table width="160" border="0" cellpadding="0" cellspacing="0" class="calborder">
+								<td valign="center" align="left" valign="top">
+									<table width="160" border="0" cellpadding="0" cellspacing="0">
 										<tr>
-											<td align="left" valign="top" bgcolor="#DDDDDD" width="1%" background="images/side_bg.gif"><img src="images/spacer.gif" width="1" height="20"></td>
-											<td bgcolor="#DDDDDD" align="center" class="G10B" width="98%" background="images/side_bg.gif"><b><?php echo "Jump to"; ?></b></td>
-											<td align="right" valign="top" bgcolor="#DDDDDD" width="1%" background="images/side_bg.gif"></td>
-										</tr>
-										<tr>
-											<td colspan="3" bgcolor="#FFFFFF" align="center">
+											<td colspan="3" bgcolor="#FFFFFF" align="center" valign="top">
 												<table border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF" width="100%">
 													<tr>
-														<td colspan="7"><img src="images/spacer.gif" width="21" height="6"></td>
+														<td width="1%"><img src="images/spacer.gif" width="4" height="1"></td>
+														<td colspan="6" class="G10B"><b><?php echo "$cal_displayname2"; ?></b></td>
+													</tr>
+													<tr>
+														<td colspan="7"><img src="images/spacer.gif" width="21" height="3"></td>
 													</tr>
 													<tr>
 														<td width="1%"><img src="images/spacer.gif" width="4" height="1"></td>
-														<td colspan="6" class="G10B"><?php include('./functions/list_icals.php'); ?></td>
+														<td colspan="6" class="G10B"><?php echo "<a class=\"psf\" href=\"day.php?cal=$cal&getdate=$today_today\">$goday_lang</a>"; ?></td>
 													</tr>
 													<tr>
-														<td colspan="7"><img src="images/spacer.gif" width="21" height="5"></td>
+														<td colspan="7"><img src="images/spacer.gif" width="21" height="1"></td>
 													</tr>
 													<tr>
 														<td width="1%"><img src="images/spacer.gif" width="4" height="1"></td>
-														<td colspan="6" class="G10B"><?php include('./functions/list_months.php'); ?></td>
+														<td colspan="6" class="G10B"><?php echo "<a class=\"psf\" href=\"week.php?cal=$cal&getdate=$today_today\">$goweek_lang</a>"; ?></td>
+													</tr>
+													<tr>
+														<td colspan="7"><img src="images/spacer.gif" width="21" height="1"></td>
+													</tr>
+													<tr>
+														<td width="1%"><img src="images/spacer.gif" width="4" height="1"></td>
+														<td colspan="6" class="G10B"><?php echo "<a class=\"psf\" href=\"month.php?cal=$cal&getdate=$today_today\">$gomonth_lang</a>"; ?></td>
 													</tr>
 													<tr>
 														<td colspan="7"><img src="images/spacer.gif" width="21" height="5"></td>
 													</tr>
 													<tr>
 														<td width="1%"><img src="images/spacer.gif" width="4" height="1"></td>
-														<td colspan="6" class="G10B"><?php include('./functions/list_weeks.php'); ?></td>
+														<td width="1%" align="middle"><?php echo "<a class=\"psf\" href=\"$fullpath$cal.ics\"><img src=\"images/smallicon.gif\" alt=\"\" width=\"13\" height=\"16\" border=\"0\" align=\"middle\"></a>"; ?></td>
+														<td width="1%"><img src="images/spacer.gif" width="3" height="1"></td>
+														<td colspan="4" class="G10B"><?php echo "<a class=\"psf\" href=\"$fullpath$cal.ics\">$subscribe_lang</a>"; ?></td>
 													</tr>
-													<?php
-													if ($display_custom_goto == "yes") {
-													?>
 													<tr>
 														<td width="1%"><img src="images/spacer.gif" width="4" height="1"></td>
-														<td colspan="6" class="G10B">
-															<form action="day.php" method="GET">
-																<input type="hidden" name="cal" value="<?php print urlencode($cal); ?>">
-																<input type="text" size="15" name="jumpto_day">
-																<input type="submit" value="Go">
-															</form>
-														</td>
+														<td width="1%" align="middle"><?php echo "<a class=\"psf\" href=\"$filename\"><img src=\"images/download_arrow.gif\" alt=\"\" width=\"13\" height=\"16\" border=\"0\" align=\"middle\"></a>"; ?></td>
+														<td width="1%"><img src="images/spacer.gif" width="3" height="1"></td>
+														<td colspan="4" class="G10B"><?php echo "<a class=\"psf\" href=\"$filename\">$download_lang</a>"; ?></td>
 													</tr>
-													<?php
-													}
-													?>
 												</table>
 											</td>
 										</tr>
@@ -221,7 +220,7 @@
 									</table>
 								</td>
 							</tr>
-						</table>
+						</table>	
 					</td>
 				</tr>
 			</table>
@@ -230,11 +229,11 @@
 	<table cellpadding="0" cellspacing="0" border="0" width="160">
 		<tr>
 			<td valign="center" align="center">
-				<table width="160" border="0" cellpadding="0" cellspacing="0" class="calborder">
+				<table width="160" border="0" cellpadding="0" cellspacing="0">
 					<tr>
-						<td align="left" valign="top" bgcolor="#DDDDDD" width="1" background="images/side_bg.gif"><img src="images/spacer.gif" width="1" height="20"></td>
-						<td bgcolor="#DDDDDD" align="center" class="G10B" background="images/side_bg.gif"><b><?php print (strftime ($dateFormat_month, strtotime("+1 month", strtotime($getdate)))); ?></b></td>
-						<td align="right" valign="top" bgcolor="#DDDDDD" width="1" background="images/side_bg.gif"></td>
+						<td align="left" valign="top" width="1"><img src="images/spacer.gif" width="1" height="20"></td>
+						<td align="center" class="G10B"><b><?php print (strftime ($dateFormat_month, strtotime("+1 month", strtotime($getdate)))); ?></b></td>
+						<td align="right" valign="top" width="1"></td>
 					</tr>
 					<tr>
 						<td colspan="3" bgcolor="#FFFFFF" align="center">
diff --git a/sidebar.php b/sidebar.php
index be84045..3dc89cf 100644
--- a/sidebar.php
+++ b/sidebar.php
@@ -32,21 +32,21 @@
 								</tr>
 								<tr>
 									<td width="1%"><img src="images/spacer.gif" width="4" height="1"></td>
-									<td colspan="6" class="G10B"><?php echo "<a class=\"psf\" href=\"day.php?cal=$cal&getdate=$today_today\">Go to Today</a>"; ?></td>
+									<td colspan="6" class="G10B"><?php echo "<a class=\"psf\" href=\"day.php?cal=$cal&getdate=$today_today\">$goday_lang</a>"; ?></td>
 								</tr>
 								<tr>
 									<td colspan="7"><img src="images/spacer.gif" width="21" height="1"></td>
 								</tr>
 								<tr>
 									<td width="1%"><img src="images/spacer.gif" width="4" height="1"></td>
-									<td colspan="6" class="G10B"><?php echo "<a class=\"psf\" href=\"week.php?cal=$cal&getdate=$today_today\">Go to This Week</a>"; ?></td>
+									<td colspan="6" class="G10B"><?php echo "<a class=\"psf\" href=\"week.php?cal=$cal&getdate=$today_today\">$goweek_lang</a>"; ?></td>
 								</tr>
 								<tr>
 									<td colspan="7"><img src="images/spacer.gif" width="21" height="1"></td>
 								</tr>
 								<tr>
 									<td width="1%"><img src="images/spacer.gif" width="4" height="1"></td>
-									<td colspan="6" class="G10B"><?php echo "<a class=\"psf\" href=\"month.php?cal=$cal&getdate=$today_today\">Go to This Month</a>"; ?></td>
+									<td colspan="6" class="G10B"><?php echo "<a class=\"psf\" href=\"month.php?cal=$cal&getdate=$today_today\">$gomonth_lang</a>"; ?></td>
 								</tr>
 								<tr>
 									<td colspan="7"><img src="images/spacer.gif" width="21" height="5"></td>