[PHPiCalendar-Commits] phpicalendar/includes calendar_nav.php,1.8,1.9 event.php,1.9,1.10 sidebar.php,1.17,1.18

[<jo...@us...>]

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

Modified Files:
	calendar_nav.php event.php sidebar.php 
Log Message:
Set magic string $ALL_CALENDARS_COMBINED = 'all_calendars_combined971'.
All previous references to 'all_calendars_combined971' now point at
$ALL_CALENDARS_COMBINED.

Uncommented closing form tag on sidebar.php, and set correct spacing
for the entire sidebar.


Index: calendar_nav.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/calendar_nav.php,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** calendar_nav.php	16 Sep 2003 05:38:34 -0000	1.8
--- calendar_nav.php	20 Sep 2003 00:16:05 -0000	1.9
***************
*** 1,5 ****
  	<?php
  	
! 	if ($cal == 'all_calenders_combined971') {
  		$cal_displayname2 = $all_cal_comb_lang;
  	} else {
--- 1,5 ----
  	<?php
  	
! 	if ($cal == $ALL_CALENDARS_COMBINED) {
  		$cal_displayname2 = $all_cal_comb_lang;
  	} else {
***************
*** 140,144 ****
  												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>
--- 140,144 ----
  												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_CALENDARS_COMBINED) echo "<a class=\"psf\" href=\"$subscribe_path\">$subscribe_lang</a>&nbsp;|&nbsp;<a class=\"psf\" href=\"$download_filename\">$download_lang</a>\n";
  											 ?>
  											</td>

Index: event.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/event.php,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** event.php	14 Sep 2003 18:31:14 -0000	1.9
--- event.php	20 Sep 2003 00:16:05 -0000	1.10
***************
*** 80,84 ****
    <meta http-equiv="content-type" content="text/html;charset=UTF-8">
    <title><?php 
!   				if ($calendar_name == 'all_calenders_combined971') {
  					echo "$all_cal_comb_lang";
  				} else {
--- 80,84 ----
    <meta http-equiv="content-type" content="text/html;charset=UTF-8">
    <title><?php 
!   				if ($calendar_name == $ALL_CALENDARS_COMBINED) {
  					echo "$all_cal_comb_lang";
  				} else {
***************
*** 93,97 ****
  		<td align="center" width="98%" class="sideback"><font class="G10BOLD">
  			<?php 
! 				if ($calendar_name == 'all_calenders_combined971') {
  					echo "$all_cal_comb_lang";
  				} else {
--- 93,97 ----
  		<td align="center" width="98%" class="sideback"><font class="G10BOLD">
  			<?php 
! 				if ($calendar_name == $ALL_CALENDARS_COMBINED) {
  					echo "$all_cal_comb_lang";
  				} else {

Index: sidebar.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/includes/sidebar.php,v
retrieving revision 1.17
retrieving revision 1.18
diff -C2 -d -r1.17 -r1.18
*** sidebar.php	16 Sep 2003 06:47:50 -0000	1.17
--- sidebar.php	20 Sep 2003 00:16:05 -0000	1.18
***************
*** 4,8 ****
  	$really_today_today = date ('Ymd', $really_unix_time);
  	
! 	if ($cal == 'all_calenders_combined971') {
  		$cal_displayname2 = $all_cal_comb_lang;
  	} else {
--- 4,8 ----
  	$really_today_today = date ('Ymd', $really_unix_time);
  	
! 	if ($cal == $ALL_CALENDARS_COMBINED) {
  		$cal_displayname2 = $all_cal_comb_lang;
  	} else {
***************
*** 17,21 ****
  	
  	?>
! 	
  	<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
  		<tr>
--- 17,21 ----
  	
  	?>
! 	<form action="" method="GET">	
  	<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
  		<tr>
***************
*** 36,40 ****
  					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>';
  				 ?>
--- 36,40 ----
  					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_CALENDARS_COMBINED) 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>';
  				 ?>
***************
*** 42,46 ****
  		</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">
--- 42,47 ----
  		</tr>
  	</table>
! 	</form>
! 	<form action="day.php" method="GET">
  	<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
  		<tr height="20">
***************
*** 52,61 ****
  				
  				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');
  				include('./functions/list_years.php');
  				include('./functions/list_months.php');
  				include('./functions/list_weeks.php');
- 				//echo "</form>";
  				if ($show_search == 'yes') {
  					echo $search_box;
--- 53,61 ----
  				
  				echo '<div style="padding: 5px;">';
! 				echo "<select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value+'$query');\">";
  				include('./functions/list_icals.php');
  				include('./functions/list_years.php');
  				include('./functions/list_months.php');
  				include('./functions/list_weeks.php');
  				if ($show_search == 'yes') {
  					echo $search_box;
***************
*** 73,80 ****
  		</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) { ?>
! 	
  	<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
  		<tr height="20">
--- 73,80 ----
  		</tr>
  	</table>
! 	</form>
  	
  	<?php if (isset($master_array[($tomorrows_date)]) && sizeof($master_array[($tomorrows_date)]) > 0) { ?>
! 	<form action="" method="GET">
  	<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
  		<tr height="20">
***************
*** 134,142 ****
  		</tr>
  	</table>
! 	<img src="images/spacer.gif" width="1" height="10" alt=" "><br>
  <?php 
  	}
  		if ((isset($master_array['-2'])) && ($show_todos == 'yes')) { ?>
! 		
  	<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
  		<tr height="20">
--- 134,142 ----
  		</tr>
  	</table>
! 	</form>
  <?php 
  	}
  		if ((isset($master_array['-2'])) && ($show_todos == 'yes')) { ?>
! 	<form action="" method="GET">
  	<table width="170" border="0" cellpadding="0" cellspacing="0" class="calborder">
  		<tr height="20">
***************
*** 211,220 ****
  		</tr>
  	</table>
! 
! 	<img src="images/spacer.gif" width="1" height="10" alt=" "><br>
  <?php } 
  		$fake_getdate_time = strtotime($this_year.'-'.$this_month.'-15');
  ?>	
! 
  	<table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder">
  		<tr height="20">
--- 211,219 ----
  		</tr>
  	</table>
! 	</form>
  <?php } 
  		$fake_getdate_time = strtotime($this_year.'-'.$this_month.'-15');
  ?>	
! 	<form action="" method="GET">
  	<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">
--- 270,275 ----
  		</tr>
  	</table>
! 	</form>
! 	<form action="" method="GET">
  	<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">
--- 326,331 ----
  		</tr>
  	</table>
! 	</form>
! 
  	<table width="170" border="0" cellpadding="3" cellspacing="0" class="calborder">
  		<tr height="20">