[PHPiCalendar-Commits] phpicalendar/includes sidebar.php,1.15,1.16

SourceForge Headquarters 225 Broadway Suite 1600 San Diego, CA 92101 +1 (858) 422-6466

Update of /cvsroot/phpicalendar/phpicalendar/includes
In directory sc8-pr-cvs1:/tmp/cvs-serv7186/includes

Modified Files:
	sidebar.php 
Log Message:
more code lightening.


Index: sidebar.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/sidebar.php,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** sidebar.php	16 Sep 2003 05:38:34 -0000	1.15
--- sidebar.php	16 Sep 2003 06:14:16 -0000	1.16
***************
*** 26,60 ****
  		<tr>
  			<td colspan="3" bgcolor="#FFFFFF" align="left">
! 				<table border="0" cellspacing="0" cellpadding="1" 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>
  		</tr>
- 		<tr>
- 			<td colspan="3"><img src="images/spacer.gif" width="1" height="6" alt=" "></td>
- 		</tr>
  	</table>
! 	<br>
! 	<table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder">
  		<tr height="20">
  			<td align="center" class="sideback"><font class="G10BOLD"><?php echo "$jump_lang"; ?></font></td>
--- 26,47 ----
  		<tr>
  			<td colspan="3" bgcolor="#FFFFFF" align="left">
! 				<?php 
! 					echo '<div style="padding: 5px;">';
! 					echo '<font class="G10BOLD">'.$cal_displayname2.'</font><br>';
! 					echo '<span class="G10">';
! 					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";
! 					echo '</span></div>';
! 				 ?>
  			</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"><font class="G10BOLD"><?php echo "$jump_lang"; ?></font></td>
***************
*** 64,68 ****
  				<?php 
  				
! 				echo '<img src="images/spacer.gif" width="1" height="6" alt=" "><br>';
  				echo "<form action=\"day.php\" method=\"GET\"><select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value+'$query');\">";
  				include('./functions/list_icals.php');
--- 51,55 ----
  				<?php 
  				
! 				echo '<div style="padding: 5px;">';
  				echo "<form action=\"day.php\" method=\"GET\"><select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value+'$query');\">";
  				include('./functions/list_icals.php');
***************
*** 70,74 ****
  				include('./functions/list_months.php');
  				include('./functions/list_weeks.php');
! 				echo "</form>";
  				if ($show_search == 'yes') {
  					echo $search_box;
--- 57,61 ----
  				include('./functions/list_months.php');
  				include('./functions/list_weeks.php');
! 				//echo "</form>";
  				if ($show_search == 'yes') {
  					echo $search_box;
***************
*** 81,90 ****
  					echo '</form>';
  				} 
! 				
  				?>
  			</td>
  		</tr>
  	</table>
! 	<br>
  	
  	<?php if (isset($master_array[($tomorrows_date)]) && sizeof($master_array[($tomorrows_date)]) > 0) { ?>
--- 68,77 ----
  					echo '</form>';
  				} 
! 				echo '</div>';
  				?>
  			</td>
  		</tr>
  	</table>
! 	<img src="images/spacer.gif" width="1" height="10" alt=" "><br>
  	
  	<?php if (isset($master_array[($tomorrows_date)]) && sizeof($master_array[($tomorrows_date)]) > 0) { ?>
***************
*** 92,96 ****
  	<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
  		<tr height="20">
! 			<td align="center" width="98%" class="sideback"><font class="G10BOLD"><?php echo "$tomorrows_lang"; ?></font></td>
  		</tr>
  		<tr>
--- 79,83 ----
  	<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
  		<tr height="20">
! 			<td align="center" class="sideback"><font class="G10BOLD"><?php echo "$tomorrows_lang"; ?></font></td>
  		</tr>
  		<tr>
***************
*** 147,151 ****
  		</tr>
  	</table>
! 	<br>
  <?php 
  	}
--- 134,138 ----
  		</tr>
  	</table>
! 	<img src="images/spacer.gif" width="1" height="10" alt=" "><br>
  <?php 
  	}
***************
*** 225,229 ****
  	</table>
  
! 	<br>
  <?php } 
  		$fake_getdate_time = strtotime($this_year.'-'.$this_month.'-15');
--- 212,216 ----
  	</table>
  
! 	<img src="images/spacer.gif" width="1" height="10" alt=" "><br>
  <?php } 
  		$fake_getdate_time = strtotime($this_year.'-'.$this_month.'-15');
***************
*** 284,288 ****
  		</tr>
  	</table>
! 	<br>
  	<table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder">
  		<tr height="20">
--- 271,275 ----
  		</tr>
  	</table>
! 	<img src="images/spacer.gif" width="1" height="10" alt=" "><br>
  	<table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder">
  		<tr height="20">
***************
*** 339,343 ****
  		</tr>
  	</table>
! 	<br>
  	<table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder">
  		<tr height="20">
--- 326,330 ----
  		</tr>
  	</table>
! 	<img src="images/spacer.gif" width="1" height="10" alt=" "><br>
  	<table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder">
  		<tr height="20">