[PHPiCalendar-Commits] phpicalendar/functions list_icals.php,1.14,1.15 list_months.php,1.6,1.7 list_weeks.php,1.6,1.7 list_years.php,1.3,1.4

[<cl...@us...>]

Update of /cvsroot/phpicalendar/phpicalendar/functions
In directory sc8-pr-cvs1:/tmp/cvs-serv2036/functions

Modified Files:
	list_icals.php list_months.php list_weeks.php list_years.php 
Log Message:
Finally fixed the jumpto's to not have space around them. Also cleaned up 
the HTML footprint to be slimmer.



Index: list_icals.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/list_icals.php,v
retrieving revision 1.14
retrieving revision 1.15
diff -C2 -d -r1.14 -r1.15
*** list_icals.php	15 Sep 2003 01:00:44 -0000	1.14
--- list_icals.php	16 Sep 2003 05:38:34 -0000	1.15
***************
*** 7,13 ****
  	} else {
  		$query="";
! 	}
! 	print "<form action=\"day.php\" method=\"GET\">\n<select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value+'$query');\">\n";
! 	
  	// open file
  	$dir_handle = @opendir($calendar_path) or die(error(sprintf($error_path_lang, $calendar_path), $cal_filename));
--- 7,11 ----
  	} else {
  		$query="";
! 	}	
  	// open file
  	$dir_handle = @opendir($calendar_path) or die(error(sprintf($error_path_lang, $calendar_path), $cal_filename));
***************
*** 33,39 ****
  		if (!in_array($cal_filename_tmp, $blacklisted_cals)) {
  			if ($cal_tmp == $cal) {
! 				print "<option value=\"$current_view.php?cal=$cal_tmp\" selected>$cal_displayname_tmp $calendar_lang</option>\n";
  			} else {
! 				print "<option value=\"$current_view.php?cal=$cal_tmp\">$cal_displayname_tmp $calendar_lang</option>\n";	
  			}
  		}	
--- 31,37 ----
  		if (!in_array($cal_filename_tmp, $blacklisted_cals)) {
  			if ($cal_tmp == $cal) {
! 				print "<option value=\"$current_view.php?cal=$cal_tmp\" selected>$cal_displayname_tmp $calendar_lang</option>";
  			} else {
! 				print "<option value=\"$current_view.php?cal=$cal_tmp\">$cal_displayname_tmp $calendar_lang</option>";	
  			}
  		}	
***************
*** 42,48 ****
  	// option to open all (non-web) calenders together
  	if ($cal == 'all_calenders_combined971') {
! 		print "<option value=\"$current_view.php?cal=all_calenders_combined971\" selected>$all_cal_comb_lang</option>\n";
  	} else {
! 		print "<option value=\"$current_view.php?cal=all_calenders_combined971\">$all_cal_comb_lang</option>\n";
  	}
  		
--- 40,46 ----
  	// option to open all (non-web) calenders together
  	if ($cal == 'all_calenders_combined971') {
! 		print "<option value=\"$current_view.php?cal=all_calenders_combined971\" selected>$all_cal_comb_lang</option>";
  	} else {
! 		print "<option value=\"$current_view.php?cal=all_calenders_combined971\">$all_cal_comb_lang</option>";
  	}
  		
***************
*** 54,60 ****
  			$cal_encoded_tmp = urlencode($cal_tmp);
  			if ($cal_tmp == $cal_httpPrefix || $cal_tmp == $cal_webcalPrefix) {
! 				print "<option value=\"$current_view.php?cal=$cal_encoded_tmp\" selected>$cal_displayname_tmp Webcal</option>\n";
  			} else {
! 				print "<option value=\"$current_view.php?cal=$cal_encoded_tmp\">$cal_displayname_tmp Webcal</option>\n";	
  			}		
  		}
--- 52,58 ----
  			$cal_encoded_tmp = urlencode($cal_tmp);
  			if ($cal_tmp == $cal_httpPrefix || $cal_tmp == $cal_webcalPrefix) {
! 				print "<option value=\"$current_view.php?cal=$cal_encoded_tmp\" selected>$cal_displayname_tmp Webcal</option>";
  			} else {
! 				print "<option value=\"$current_view.php?cal=$cal_encoded_tmp\">$cal_displayname_tmp Webcal</option>";	
  			}		
  		}
***************
*** 65,70 ****
  	
  	// finish <select>
! 	print "</select>\n</form>";
  	
  }
  ?>	
--- 63,70 ----
  	
  	// finish <select>
! 	print "</select>";
  	
  }
+ 
+ 
  ?>	

Index: list_months.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/list_months.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** list_months.php	10 Mar 2003 18:27:11 -0000	1.6
--- list_months.php	16 Sep 2003 05:38:34 -0000	1.7
***************
*** 1,4 ****
  <?php
! print "<form action=\"day.php\" method=\"GET\">\n<select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value);\">\n";
  $month_time = strtotime("$this_year-01-01");
  $getdate_month = date("m", strtotime($getdate));
--- 1,4 ----
  <?php
! print "<select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value);\">\n";
  $month_time = strtotime("$this_year-01-01");
  $getdate_month = date("m", strtotime($getdate));
***************
*** 19,22 ****
  
  // finish <select>
! print "</select>\n</form>";
  ?>
--- 19,22 ----
  
  // finish <select>
! print "</select>";
  ?>

Index: list_weeks.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/list_weeks.php,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** list_weeks.php	10 Mar 2003 18:27:12 -0000	1.6
--- list_weeks.php	16 Sep 2003 05:38:34 -0000	1.7
***************
*** 12,16 ****
  $end_week_time = $start_week_time + (6 * 25 * 60 * 60);
  
! print "<form action=\"day.php\" method=\"GET\">\n<select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value);\">\n";
  
  // build the <option> tags
--- 12,16 ----
  $end_week_time = $start_week_time + (6 * 25 * 60 * 60);
  
! print "<select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value);\">\n";
  
  // build the <option> tags
***************
*** 30,33 ****
  
  // finish <select>
! print "</select>\n</form>";
  ?>
--- 30,33 ----
  
  // finish <select>
! print "</select>";
  ?>

Index: list_years.php
===================================================================
RCS file: /cvsroot/phpicalendar/phpicalendar/functions/list_years.php,v
retrieving revision 1.3
retrieving revision 1.4
diff -C2 -d -r1.3 -r1.4
*** list_years.php	10 Mar 2003 18:27:13 -0000	1.3
--- list_years.php	16 Sep 2003 05:38:34 -0000	1.4
***************
*** 5,9 ****
  $num_years2 = $num_years;
  //echo "$num_years2";
! print "<form action=\"day.php\" method=\"GET\">\n<select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value);\">\n";
  // build the <option> tags
  for ($i=0; $i < ($num_years2 +2); $i++) {
--- 5,9 ----
  $num_years2 = $num_years;
  //echo "$num_years2";
! print "<select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value);\">";
  // build the <option> tags
  for ($i=0; $i < ($num_years2 +2); $i++) {
***************
*** 11,15 ****
  	$yeardate = date("Ymd", $year_time2);
  	$year_year = date ("Y", $year_time2);
! 	print "<option value=\"year.php?cal=$cal&amp;getdate=$yeardate\">$year_year</option>\n";
  	$num_years2--;
  }
--- 11,15 ----
  	$yeardate = date("Ymd", $year_time2);
  	$year_year = date ("Y", $year_time2);
! 	print "<option value=\"year.php?cal=$cal&amp;getdate=$yeardate\">$year_year</option>";
  	$num_years2--;
  }
***************
*** 20,26 ****
  	$yeardate = date("Ymd", $year_time);
  	if ($year_year == $getdate_year) {
! 		print "<option value=\"year.php?cal=$cal&amp;getdate=$yeardate\" selected>$year_year</option>\n";
  	} else {
! 		print "<option value=\"year.php?cal=$cal&amp;getdate=$yeardate\">$year_year</option>\n";
  	}
  	$year_time = strtotime ("+1 year", $year_time);
--- 20,26 ----
  	$yeardate = date("Ymd", $year_time);
  	if ($year_year == $getdate_year) {
! 		print "<option value=\"year.php?cal=$cal&amp;getdate=$yeardate\" selected>$year_year</option>";
  	} else {
! 		print "<option value=\"year.php?cal=$cal&amp;getdate=$yeardate\">$year_year</option>";
  	}
  	$year_time = strtotime ("+1 year", $year_time);
***************
*** 28,31 ****
  
  // finish <select>
! print "</select>\n</form>";
  ?>
--- 28,31 ----
  
  // finish <select>
! print "</select>";
  ?>