Refixed todo popup.

12 files changed, 10 insertions, 31 deletions

diff --git a/admin.php b/admin.php
index c5ac475..c637ec4 100644
--- a/admin.php
+++ b/admin.php
@@ -48,7 +48,6 @@ $page->replace_tags(array(
 	'footer'			=> BASE.'templates/'.$template.'/footer.tpl',
 	'sidebar'			=> BASE.'templates/'.$template.'/sidebar.tpl',
 	'event_js'			=> BASE.'functions/event.js',
-	'todo_js'			=> BASE.'functions/todo.js',
 	'charset'			=> $charset,
 	'default_path'		=> '',
 	'template'			=> $template,
@@ -61,7 +60,6 @@ $page->replace_tags(array(
 	'rss_powered'	 	=> $rss_powered,
 	'rss_available' 	=> '',
 	'rss_valid' 		=> '',
-	'todo_js' 			=> '',
 	'show_search' 		=> '',
 	'l_day'				=> $lang['l_day'],
 	'l_week'			=> $lang['l_week'],
diff --git a/day.php b/day.php
index d94cc7a..3c9537e 100644
--- a/day.php
+++ b/day.php
@@ -48,7 +48,6 @@ $page->replace_tags(array(
 	'footer'			=> BASE.'templates/'.$template.'/footer.tpl',
 	'sidebar'			=> BASE.'templates/'.$template.'/sidebar.tpl',
 	'event_js'			=> BASE.'functions/event.js',
-	'todo_js'			=> BASE.'functions/todo.js',
 	'charset'			=> $charset,
 	'default_path'		=> '',
 	'template'			=> $template,
@@ -61,7 +60,6 @@ $page->replace_tags(array(
 	'rss_powered'	 	=> $rss_powered,
 	'rss_available' 	=> '',
 	'rss_valid' 		=> '',
-	'todo_js' 			=> '',
 	'show_search' 		=> '',
 	'next_day' 			=> $next_day,
 	'prev_day'	 		=> $prev_day,
diff --git a/functions/event.js b/functions/event.js
index adee336..c3d43c1 100644
--- a/functions/event.js
+++ b/functions/event.js
@@ -34,6 +34,15 @@ function EventData(event, cal, start, end, description, status, location, organi
 	this.url = url;
 }
 
+function openTodoInfo(vtodo_array) {	
+	var windowW = 460;
+	var windowH = 275;
+	var url = "includes/todo.php?vtodo_array="+vtodo_array;
+	options = "scrollbars=yes,width="+windowW+",height="+windowH;
+	info = window.open(url, "Popup", options);
+	info.focus();
+}
+
 document.popup_data = new Array();
 //-->
 </script>
\ No newline at end of file
diff --git a/functions/todo.js b/functions/todo.js
deleted file mode 100644
index 52cc96a..0000000
--- a/functions/todo.js
+++ /dev/null
@@ -1,14 +0,0 @@
-<script language="JavaScript" type="text/javascript">
-<!--
-	function openTodoInfo(vtodo_array)
-	{	
-		var windowW = 460;
-		var windowH = 275;
-		var url = "includes/todo.php?vtodo_array="+vtodo_array;
-		options = "scrollbars=yes,width="+windowW+",height="+windowH;
-		info = window.open(url, "Popup", options);
-		info.focus();
-	}
-
-//-->
-</script>
diff --git a/month.php b/month.php
index 7d968af..564a707 100644
--- a/month.php
+++ b/month.php
@@ -54,7 +54,6 @@ $page->replace_tags(array(
 	'footer'			=> BASE.'templates/'.$template.'/footer.tpl',
 	'calendar_nav'		=> BASE.'templates/'.$template.'/calendar_nav.tpl',
 	'event_js'			=> BASE.'functions/event.js',
-	'todo_js'			=> BASE.'functions/todo.js',
 	'charset'			=> $charset,
 	'template'			=> $template,
 	'cal'				=> $cal,
@@ -65,7 +64,6 @@ $page->replace_tags(array(
 	'default_path'		=> '',
 	'rss_available' 	=> '',
 	'rss_valid' 		=> '',
-	'todo_js' 			=> '',
 	'show_search' 		=> '',
 	'next_month' 		=> $next_month,
 	'prev_month'	 	=> $prev_month,
diff --git a/preferences.php b/preferences.php
index 2b8574e..810c77d 100644
--- a/preferences.php
+++ b/preferences.php
@@ -136,6 +136,7 @@ $page = new Page(BASE.'templates/'.$template.'/preferences.tpl');
 $page->replace_tags(array(
 	'header'			=> BASE.'templates/'.$template.'/header.tpl',
 	'footer'			=> BASE.'templates/'.$template.'/footer.tpl',
+	'charset'			=> $charset,
 	'template'			=> $template,
 	'default_path'		=> '',
 	'cal'				=> $cal,
@@ -145,7 +146,6 @@ $page->replace_tags(array(
 	'rss_powered'	 	=> $rss_powered,
 	'rss_available' 	=> '',
 	'rss_valid' 		=> '',
-	'todo_js' 			=> '',
 	'event_js' 			=> '',
 	'language_select' 	=> $language_select,
 	'calendar_select' 	=> $calendar_select,
diff --git a/print.php b/print.php
index 43c8573..59144b5 100644
--- a/print.php
+++ b/print.php
@@ -43,7 +43,6 @@ $page->replace_tags(array(
 	'footer'			=> BASE.'templates/'.$template.'/footer.tpl',
 	'sidebar'			=> BASE.'templates/'.$template.'/sidebar.tpl',
 	'event_js'			=> BASE.'functions/event.js',
-	'todo_js'			=> BASE.'functions/todo.js',
 	'charset'			=> $charset,
 	'default_path'		=> '',
 	'template'			=> $template,
@@ -56,7 +55,6 @@ $page->replace_tags(array(
 	'rss_powered'	 	=> $rss_powered,
 	'rss_available' 	=> '',
 	'rss_valid' 		=> '',
-	'todo_js' 			=> '',
 	'show_search' 		=> '',
 	'next_day' 			=> $next_day,
 	'prev_day'	 		=> $prev_day,
diff --git a/rss/index.php b/rss/index.php
index f886b9c..e16bb1b 100644
--- a/rss/index.php
+++ b/rss/index.php
@@ -44,7 +44,6 @@ $page->replace_tags(array(
 	'rss_available' 	=> '',
 	'rssdisable'	 	=> '',
 	'rss_valid' 		=> '',
-	'todo_js' 			=> '',
 	'show_search' 		=> '',
 	'l_rss_info'		=> $lang['l_rss_info'],
 	'l_rss_subhead'		=> $lang['l_rss_subhead'],
diff --git a/search.php b/search.php
index 0f60b14..4ddcefe 100644
--- a/search.php
+++ b/search.php
@@ -277,7 +277,6 @@ $page->replace_tags(array(
 	'footer'			=> BASE.'templates/'.$template.'/footer.tpl',
 	'sidebar'			=> BASE.'templates/'.$template.'/sidebar.tpl',
 	'event_js'			=> BASE.'functions/event.js',
-	'todo_js'			=> BASE.'functions/todo.js',
 	'charset'			=> $charset,
 	'default_path'		=> '',
 	'template'			=> $template,
@@ -290,7 +289,6 @@ $page->replace_tags(array(
 	'rss_powered'	 	=> $rss_powered,
 	'rss_available' 	=> '',
 	'rss_valid' 		=> '',
-	'todo_js' 			=> '',
 	'show_search' 		=> ''		
 	));
 
diff --git a/templates/default/header.tpl b/templates/default/header.tpl
index df6723a..f06438a 100644
--- a/templates/default/header.tpl
+++ b/templates/default/header.tpl
@@ -9,7 +9,6 @@
 	<link rel="alternate" type="application/rss+xml" title="RSS" href="{DEFAULT_VIEW}/rss/rss.php?cal={CAL}&amp;rssview={CURRENT_VIEW}">
 	<!-- switch rss_available off -->		
 	{EVENT_JS}
-	{TODO_JS}
 </head>
 <body>
 <form name="eventPopupForm" id="eventPopupForm" method="post" action="includes/event.php" style="display: none;">
diff --git a/week.php b/week.php
index 487b78a..15ceb89 100644
--- a/week.php
+++ b/week.php
@@ -50,7 +50,6 @@ $page->replace_tags(array(
 	'footer'			=> BASE.'templates/'.$template.'/footer.tpl',
 	'sidebar'			=> BASE.'templates/'.$template.'/sidebar.tpl',
 	'event_js'			=> BASE.'functions/event.js',
-	'todo_js'			=> BASE.'functions/todo.js',
 	'charset'			=> $charset,
 	'default_path'		=> '',
 	'template'			=> $template,
@@ -63,7 +62,6 @@ $page->replace_tags(array(
 	'rss_powered'	 	=> $rss_powered,
 	'rss_available' 	=> '',
 	'rss_valid' 		=> '',
-	'todo_js' 			=> '',
 	'show_search' 		=> '',
 	'next_day' 			=> $next_day,
 	'next_week' 		=> $next_week,
diff --git a/year.php b/year.php
index 2af06d1..a77fa9e 100644
--- a/year.php
+++ b/year.php
@@ -21,7 +21,6 @@ $page->replace_tags(array(
 	'header'			=> BASE.'templates/'.$template.'/header.tpl',
 	'footer'			=> BASE.'templates/'.$template.'/footer.tpl',
 	'template'			=> $template,
-	'todo_js'			=> BASE.'functions/todo.js',
 	'charset'			=> $charset,
 	'default_path'		=> '',
 	'cal'				=> $cal,
@@ -33,7 +32,6 @@ $page->replace_tags(array(
 	'rss_available' 	=> '',
 	'rss_valid' 		=> '',
 	'todo_available' 	=> '',
-	'todo_js' 			=> '',
 	'event_js' 			=> '',
 	'this_year'			=> $this_year,
 	'next_year'			=> $next_year,