Reduced HTML footprint. Cleaned up unneeded spacing.

1 files changed, 97 insertions, 164 deletions

diff --git a/includes/calendar_nav.php b/includes/calendar_nav.php
index 01afb56..870808a 100644
--- a/includes/calendar_nav.php
+++ b/includes/calendar_nav.php
@@ -36,63 +36,47 @@
 					<td valign="middle" align="center">
 						<table width="160" border="0" cellpadding="0" cellspacing="0">
 							<tr>
-								<td align="left" valign="top" width="1"><img src="images/spacer.gif" width="1" height="20" alt=" "></td>
 								<td align="center"><font class="G10BOLD"><?php print (localizeDate ($dateFormat_month, strtotime("-1 month", $fake_getdate_time))); ?></font></td>
-								<td align="right" valign="top" width="1"></td>
 							</tr>
 							<tr>
-								<td colspan="3" bgcolor="#FFFFFF" align="center">
+								<td bgcolor="#FFFFFF" align="center">
 									<table border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF">
-										<tr>
-											<td><img src="images/spacer.gif" width="21" height="3" alt=" "></td>
-											<td><img src="images/spacer.gif" width="21" height="1" alt=" "></td>
-											<td><img src="images/spacer.gif" width="21" height="1" alt=" "></td>
-											<td><img src="images/spacer.gif" width="21" height="1" alt=" "></td>
-											<td><img src="images/spacer.gif" width="21" height="1" alt=" "></td>
-											<td><img src="images/spacer.gif" width="21" height="1" alt=" "></td>
-											<td><img src="images/spacer.gif" width="21" height="1" alt=" "></td>
-										</tr>
-										<tr>
 										<?php
 											$start_day = strtotime($week_start_day);
+											echo '<tr>';
 											for ($i=0; $i<7; $i++) {
 												$day_num = date("w", $start_day);
 												$day = $daysofweekreallyshort_lang[$day_num];
-												print "<td align=\"center\"><font class=\"G10BOLD\">$day</font></td>\n";
+												echo '<td align="center" class="G10BOLD">'.$day.'</td>';
 												$start_day = strtotime("+1 day", $start_day); 
 											}
-										?>
-										</tr>
-										<tr height="3">
-											<td colspan="7"><img src="images/spacer.gif" width="1" height="3" alt=" "></td>
-										</tr>
-										<?php
-											$minical_time = strtotime("-1 month", $fake_getdate_time);
-											$minical_month = date("m", $minical_time);
-											$minical_year = date("Y", $minical_time);
-											$first_of_month = $minical_year.$minical_month."01";
-											$start_day = strtotime(dateOfWeek($first_of_month, $week_start_day));
-											$i = 0;
-											$whole_month = TRUE;
+											$minical_time 		= strtotime("-1 month", $fake_getdate_time);
+											$minical_month 		= date("m", $minical_time);
+											$minical_year 		= date("Y", $minical_time);
+											$first_of_month 	= $minical_year.$minical_month."01";
+											$start_day 			= strtotime(dateOfWeek($first_of_month, $week_start_day));
+											$i 					= 0;
+											$whole_month 		= TRUE;
+											$num_of_events 		= 0;
 											do {
-												$day = date ("j", $start_day);
-												$daylink = date ("Ymd", $start_day);
-												$check_month = date ("m", $start_day);
-												if ($check_month != $minical_month) $day= "<font class=\"G10G\">$day</font>";
+												$day 			= date ("j", $start_day);
+												$daylink 		= date ("Ymd", $start_day);
+												$check_month 	= date ("m", $start_day);
+												if ($check_month != $minical_month) $day = '<font class="G10G">'.$day.'</font>';
 												if ($i == 0) echo "<tr>\n";
 												if (isset($master_array[("$daylink")]) && ($check_month == $minical_month)) {
-													echo "<td align=\"center\" class=\"G10B\">\n";
-													echo "<a class=\"ps2\" href=\"$minical_view.php?cal=$cal&amp;getdate=$daylink\">$day</a>\n";
-													echo "</td>\n";
+													echo '<td width="22" align="center" class="G10B">';
+													echo '<a class="ps2" href="'.$minical_view.'.php?cal='.$cal.'&amp;getdate='.$daylink.'">'.$day.'</a>';
+													echo '</td>';
 												} else {
-													echo "<td align=\"center\" class=\"G10B\">\n";
-													echo "<a class=\"psf\" href=\"$minical_view.php?cal=$cal&amp;getdate=$daylink\">$day</a>\n";
-													echo "</td>\n";
+													echo '<td width="22" align="center" class="G10B">';
+													echo '<a class="psf" href="'.$minical_view.'.php?cal='.$cal.'&amp;getdate='.$daylink.'">'.$day.'</a>';
+													echo '</td>';
 												}
 												$start_day = strtotime("+1 day", $start_day); 
 												$i++;
 												if ($i == 7) { 
-													echo "</tr>\n";
+													echo '</tr>';
 													$i = 0;
 													$checkagain = date ("m", $start_day);
 													if ($checkagain != $minical_month) $whole_month = FALSE;	
@@ -100,11 +84,9 @@
 											} while ($whole_month == TRUE);
 										?>
 									</table>
+									<img src="images/spacer.gif" width="1" height="3" alt=" "><br>
 								</td>
 							</tr>
-							<tr>
-								<td colspan="3" bgcolor="#FFFFFF"><img src="images/spacer.gif" width="148" height="6" alt=" "></td>
-							</tr>
 						</table>
 					</td>
 				</tr>
@@ -117,104 +99,73 @@
 						<table cellpadding="0" cellspacing="0" border="0" width="160">
 							<tr>
 								<td valign="middle" align="center">
-									<table width="160" border="0" cellpadding="0" cellspacing="0">
+									<table border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF" width="100%">
 										<tr>
-											<td colspan="3" bgcolor="#FFFFFF" align="left">
-												<table border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF" width="100%">
-													<tr>
-														<td width="1%"><img src="images/spacer.gif" width="4" height="1" alt=" "></td>
-														<td colspan="6"><font class="G10BOLD"><?php echo "$jump_lang"; ?></font></td>
-													</tr>
-													<tr>
-														<td colspan="7"><img src="images/spacer.gif" width="21" height="3" alt=" "></td>
-													</tr>
-													<tr>
-														<td width="1%"><img src="images/spacer.gif" width="4" height="1" alt=" "></td>
-														<td colspan="6"><?php include('./functions/list_icals.php'); ?></td>
-													</tr>
-													<tr>
-														<td colspan="7"><img src="images/spacer.gif" width="21" height="5" alt=" "></td>
-													</tr>
-													<tr>
-														<td width="1%"><img src="images/spacer.gif" width="4" height="1" alt=" "></td>
-														<td colspan="6"><?php include('./functions/list_years.php'); ?></td>
-													</tr>
-													<tr>
-														<td colspan="7"><img src="images/spacer.gif" width="21" height="5" alt=" "></td>
-													</tr>
-													<tr>
-														<td width="1%"><img src="images/spacer.gif" width="4" height="1" alt=" "></td>
-														<td colspan="6"><?php include('./functions/list_months.php'); ?></td>
-													</tr>
-													<tr>
-														<td colspan="7"><img src="images/spacer.gif" width="21" height="5" alt=" "></td>
-													</tr>
-													<tr>
-														<td width="1%"><img src="images/spacer.gif" width="4" height="1" alt=" "></td>
-														<td colspan="6"><?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" alt=" "></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 width="4"></td>
+											<td>
+												<?php 
+													include('./functions/list_icals.php');
+													include('./functions/list_years.php');
+													include('./functions/list_months.php');
+													include('./functions/list_weeks.php'); 
+												?>
 											</td>
 										</tr>
+										<?php
+										if ($display_custom_goto == "yes") {
+										?>
 										<tr>
-											<td colspan="3" bgcolor="#FFFFFF"><img src="images/spacer.gif" width="148" height="6" alt=" "></td>
+											<td width="4"><img src="images/spacer.gif" width="4" height="1" alt=" "></td>
+											<td 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
+										}
+										if ($show_search == 'yes') { ?>
+										<tr>
+											<td colspan="2"><img src="images/spacer.gif" width="21" height="3" alt=" "></td>
+										</tr>
+										<tr>
+											<td width="4"><img src="images/spacer.gif" width="4" height="1" alt=" "></td>
+											<td valign="middle" align="left"><?php echo "$search_box"; ?></td>
+										</tr>
+										<?php } ?>
 									</table>
 								</td>
 							</tr>
 						</table>
 					</td>
-					<td><img src="images/spacer.gif" width="10" height="1" alt=" "></td>
+					<td><img src="images/spacer.gif" width="20" height="1" alt=" "></td>
 					<td width="160" valign="top">
 						<table cellpadding="0" cellspacing="0" border="0" width="160">
 							<tr>
 								<td valign="middle" align="left" valign="top">
-									<table width="160" border="0" cellpadding="0" cellspacing="0">
+									<table border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF" width="100%">
 										<tr>
-											<td colspan="3" bgcolor="#FFFFFF" align="left" 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="2" alt=" "></td>
-													</tr>
-													<tr>
-														<td width="1%"><img src="images/spacer.gif" width="4" height="1" alt=" "></td>
-														<td colspan="6"><font class="G10BOLD"><?php echo "$cal_displayname2"; ?></font></td>
-													</tr>
-													<tr>
-														<td width="1%"><img src="images/spacer.gif" width="4" height="1" alt=" "></td>
-														<td colspan="6" class="G10B">
-														<?php 
-															echo "<a class=\"psf\" href=\"day.php?cal=$cal&amp;getdate=$really_today_today\">$goday_lang</a><br>\n";
-															echo "<a class=\"psf\" href=\"week.php?cal=$cal&amp;getdate=$really_today_today\">$goweek_lang</a><br>\n";
-															echo "<a class=\"psf\" href=\"month.php?cal=$cal&amp;getdate=$really_today_today\">$gomonth_lang</a><br>\n";
-															echo "<a class=\"psf\" href=\"year.php?cal=$cal&amp;getdate=$really_today_today\">$goyear_lang</a><br>\n";
-															echo "<a class=\"psf\" href=\"print.php?cal=$cal&amp;getdate=$getdate&amp;printview=$current_view\">$goprint_lang</a><br>\n";
-															if ($allow_preferences != 'no') echo "<a class=\"psf\" href=\"preferences.php?cal=$cal&amp;getdate=$getdate\">$preferences_lang</a><br>\n";
-															if ($cal != 'all_calenders_combined971') echo "<a class=\"psf\" href=\"$subscribe_path\">$subscribe_lang</a>&nbsp;|&nbsp;<a class=\"psf\" href=\"$download_filename\">$download_lang</a>\n";
-														 ?>
-														</td>
-													</tr>
-												</table>
-											</td>
+											<td colspan="7"><img src="images/spacer.gif" width="21" height="2" alt=" "></td>
 										</tr>
 										<tr>
-											<td colspan="3" bgcolor="#FFFFFF"><img src="images/spacer.gif" width="148" height="6" alt=" "></td>
+											<td width="1%"><img src="images/spacer.gif" width="4" height="1" alt=" "></td>
+											<td colspan="6"><font class="G10BOLD"><?php echo "$cal_displayname2"; ?></font></td>
+										</tr>
+										<tr>
+											<td width="1%"><img src="images/spacer.gif" width="4" height="1" alt=" "></td>
+											<td colspan="6" class="G10B">
+											<?php 
+												echo "<a class=\"psf\" href=\"day.php?cal=$cal&amp;getdate=$really_today_today\">$goday_lang</a><br>\n";
+												echo "<a class=\"psf\" href=\"week.php?cal=$cal&amp;getdate=$really_today_today\">$goweek_lang</a><br>\n";
+												echo "<a class=\"psf\" href=\"month.php?cal=$cal&amp;getdate=$really_today_today\">$gomonth_lang</a><br>\n";
+												echo "<a class=\"psf\" href=\"year.php?cal=$cal&amp;getdate=$really_today_today\">$goyear_lang</a><br>\n";
+												echo "<a class=\"psf\" href=\"print.php?cal=$cal&amp;getdate=$getdate&amp;printview=$current_view\">$goprint_lang</a><br>\n";
+												if ($allow_preferences != 'no') echo "<a class=\"psf\" href=\"preferences.php?cal=$cal&amp;getdate=$getdate\">$preferences_lang</a><br>\n";
+												if ($cal != 'all_calenders_combined971') echo "<a class=\"psf\" href=\"$subscribe_path\">$subscribe_lang</a>&nbsp;|&nbsp;<a class=\"psf\" href=\"$download_filename\">$download_lang</a>\n";
+											 ?>
+											</td>
 										</tr>
 									</table>
 								</td>
@@ -228,65 +179,49 @@
 	<table cellpadding="0" cellspacing="0" border="0" width="160">
 		<tr>
 			<td valign="middle" align="center">
-				<table width="160" border="0" cellpadding="0" cellspacing="0">
+				<table width="160" border="0" cellpadding="3" cellspacing="0">
 					<tr>
-						<td align="left" valign="top" width="1"><img src="images/spacer.gif" width="1" height="20" alt=" "></td>
 						<td align="center"><font class="G10BOLD"><?php print (localizeDate ($dateFormat_month, strtotime("+1 month", $fake_getdate_time))); ?></font></td>
-						<td align="right" valign="top" width="1"></td>
 					</tr>
 					<tr>
-						<td colspan="3" bgcolor="#FFFFFF" align="center">
+						<td bgcolor="#FFFFFF" align="center">
 							<table border="0" cellspacing="0" cellpadding="0" bgcolor="#FFFFFF">
-								<tr>
-									<td><img src="images/spacer.gif" width="21" height="3" alt=" "></td>
-									<td><img src="images/spacer.gif" width="21" height="1" alt=" "></td>
-									<td><img src="images/spacer.gif" width="21" height="1" alt=" "></td>
-									<td><img src="images/spacer.gif" width="21" height="1" alt=" "></td>
-									<td><img src="images/spacer.gif" width="21" height="1" alt=" "></td>
-									<td><img src="images/spacer.gif" width="21" height="1" alt=" "></td>
-									<td><img src="images/spacer.gif" width="21" height="1" alt=" "></td>
-								</tr>
-								<tr>
 								<?php
 									$start_day = strtotime($week_start_day);
+									echo '<tr>';
 									for ($i=0; $i<7; $i++) {
 										$day_num = date("w", $start_day);
 										$day = $daysofweekreallyshort_lang[$day_num];
-										print "<td align=\"center\"><font class=\"G10BOLD\">$day</font></td>\n";
+										echo '<td align="center" class="G10BOLD">'.$day.'</td>';
 										$start_day = strtotime("+1 day", $start_day); 
 									}
-								?>
-								</tr>
-								<tr height="3">
-									<td colspan="7"><img src="images/spacer.gif" width="1" height="3" alt=" "></td>
-								</tr>
-								<?php
-									$minical_time = strtotime("+1 month", $fake_getdate_time);
-									$minical_month = date("m", $minical_time);
-									$minical_year = date("Y", $minical_time);
-									$first_of_month = $minical_year.$minical_month."01";
-									$start_day = strtotime(dateOfWeek($first_of_month, $week_start_day));
-									$i = 0;
-									$whole_month = TRUE;
+									$minical_time 		= strtotime("+1 month", $fake_getdate_time);
+									$minical_month 		= date("m", $minical_time);
+									$minical_year 		= date("Y", $minical_time);
+									$first_of_month 	= $minical_year.$minical_month."01";
+									$start_day 			= strtotime(dateOfWeek($first_of_month, $week_start_day));
+									$i 					= 0;
+									$whole_month 		= TRUE;
+									$num_of_events 		= 0;
 									do {
-										$day = date ("j", $start_day);
-										$daylink = date ("Ymd", $start_day);
-										$check_month = date ("m", $start_day);
-										if ($check_month != $minical_month) $day= "<font class=\"G10G\">$day</font>";
+										$day 			= date ("j", $start_day);
+										$daylink 		= date ("Ymd", $start_day);
+										$check_month 	= date ("m", $start_day);
+										if ($check_month != $minical_month) $day = '<font class="G10G">'.$day.'</font>';
 										if ($i == 0) echo "<tr>\n";
 										if (isset($master_array[("$daylink")]) && ($check_month == $minical_month)) {
-											echo "<td align=\"center\" class=\"G10B\">\n";
-											echo "<a class=\"ps2\" href=\"$minical_view.php?cal=$cal&amp;getdate=$daylink\">$day</a>\n";
-											echo "</td>\n";
+											echo '<td width="22" align="center" class="G10B">';
+											echo '<a class="ps2" href="'.$minical_view.'.php?cal='.$cal.'&amp;getdate='.$daylink.'">'.$day.'</a>';
+											echo '</td>';
 										} else {
-											echo "<td align=\"center\" class=\"G10B\">\n";
-											echo "<a class=\"psf\" href=\"$minical_view.php?cal=$cal&amp;getdate=$daylink\">$day</a>\n";
-											echo "</td>\n";
+											echo '<td width="22" align="center" class="G10B">';
+											echo '<a class="psf" href="'.$minical_view.'.php?cal='.$cal.'&amp;getdate='.$daylink.'">'.$day.'</a>';
+											echo '</td>';
 										}
 										$start_day = strtotime("+1 day", $start_day); 
 										$i++;
 										if ($i == 7) { 
-											echo "</tr>\n";
+											echo '</tr>';
 											$i = 0;
 											$checkagain = date ("m", $start_day);
 											if ($checkagain != $minical_month) $whole_month = FALSE;	
@@ -294,11 +229,9 @@
 									} while ($whole_month == TRUE);
 								?>
 							</table>
+							<img src="images/spacer.gif" width="1" height="3" alt=" "><br>
 						</td>
 					</tr>
-					<tr>
-						<td colspan="3" bgcolor="#FFFFFF"><img src="images/spacer.gif" width="148" height="6" alt=" "></td>
-					</tr>
 				</table>
 			</td>
 		</tr>