Finally fixed the jumpto's to not have space around them. Also cleaned up

the HTML footprint to be slimmer.

4 files changed, 19 insertions, 19 deletions

diff --git a/functions/list_icals.php b/functions/list_icals.php
index 91b6b7c..904b74a 100644
--- a/functions/list_icals.php
+++ b/functions/list_icals.php
@@ -6,9 +6,7 @@ if ($display_ical_list == "yes") {
 		$query="&getdate=$getdate";
 	} 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));
 	
@@ -32,18 +30,18 @@ if ($display_ical_list == "yes") {
 		$cal_displayname_tmp = str_replace("32", " ", $cal_filename_tmp);
 		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";
+				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>\n";	
+				print "<option value=\"$current_view.php?cal=$cal_tmp\">$cal_displayname_tmp $calendar_lang</option>";	
 			}
 		}	
 	}			
 
 	// 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";
+		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>\n";
+		print "<option value=\"$current_view.php?cal=all_calenders_combined971\">$all_cal_comb_lang</option>";
 	}
 		
 	foreach($list_webcals as $cal_tmp) {
@@ -53,9 +51,9 @@ if ($display_ical_list == "yes") {
 			$cal_displayname_tmp = substr($cal_displayname_tmp,0,-4);
 			$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";
+				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>\n";	
+				print "<option value=\"$current_view.php?cal=$cal_encoded_tmp\">$cal_displayname_tmp Webcal</option>";	
 			}		
 		}
 	}
@@ -64,7 +62,9 @@ if ($display_ical_list == "yes") {
 	closedir($dir_handle);
 	
 	// finish <select>
-	print "</select>\n</form>";
+	print "</select>";
 	
 }
+
+
 ?>	
diff --git a/functions/list_months.php b/functions/list_months.php
index baaccb4..a6bfb74 100644
--- a/functions/list_months.php
+++ b/functions/list_months.php
@@ -1,5 +1,5 @@
 <?php
-print "<form action=\"day.php\" method=\"GET\">\n<select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value);\">\n";
+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));
 
@@ -18,5 +18,5 @@ for ($i=0; $i<12; $i++) {
 }
 
 // finish <select>
-print "</select>\n</form>";
+print "</select>";
 ?>
\ No newline at end of file
diff --git a/functions/list_weeks.php b/functions/list_weeks.php
index 6f5410b..4de03d8 100644
--- a/functions/list_weeks.php
+++ b/functions/list_weeks.php
@@ -11,7 +11,7 @@ $check_week = strtotime($getdate);
 $start_week_time = strtotime(dateOfWeek(date("Ymd", strtotime("$this_year-01-01")), $week_start_day));
 $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";
+print "<select name=\"action\" class=\"query_style\" onChange=\"window.location=(this.options[this.selectedIndex].value);\">\n";
 
 // build the <option> tags
 do {
@@ -29,5 +29,5 @@ do {
 } while (date("Y", $start_week_time) <= $this_year);
 
 // finish <select>
-print "</select>\n</form>";
+print "</select>";
 ?>
\ No newline at end of file
diff --git a/functions/list_years.php b/functions/list_years.php
index 07e43f8..f5e823e 100644
--- a/functions/list_years.php
+++ b/functions/list_years.php
@@ -4,13 +4,13 @@ $year_time = strtotime("$getdate");
 $getdate_year = date("Y", strtotime($getdate));
 $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";
+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++) {
 	$year_time2 = strtotime ("-$num_years2 year", $year_time);
 	$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";
+	print "<option value=\"year.php?cal=$cal&amp;getdate=$yeardate\">$year_year</option>";
 	$num_years2--;
 }
 $year_time = strtotime("$this_year-01-01");
@@ -19,13 +19,13 @@ for ($i=0; $i < ($num_years +1); $i++) {
 	$year_year = date ("Y", $year_time);
 	$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";
+		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>\n";
+		print "<option value=\"year.php?cal=$cal&amp;getdate=$yeardate\">$year_year</option>";
 	}
 	$year_time = strtotime ("+1 year", $year_time);
 }
 
 // finish <select>
-print "</select>\n</form>";
+print "</select>";
 ?>
\ No newline at end of file