Move Scriptaculous/Prototype includes to head.inc and remove the code duplication

author: Bill Marquette <bill.marquette@gmail.com> 2009-03-13 01:03:20 -0500
committer: Bill Marquette <bill.marquette@gmail.com> 2009-03-13 01:04:26 -0500
commit: 2e069686fb867be9aedd3d39cecc57806f9c2af1 (patch)
tree: 4ff480a22419ca4bc66f5e250c695bcab71a85a9 /usr/local
parent: 6327599dc2654f2f72a38d540a2e415f04fa93a0 (diff)
download: pfsense-2e069686fb867be9aedd3d39cecc57806f9c2af1.zip
pfsense-2e069686fb867be9aedd3d39cecc57806f9c2af1.tar.gz
21 files changed, 7 insertions, 66 deletions
diff --git a/usr/local/www/diag_dump_states.php b/usr/local/www/diag_dump_states.php
index fc6f61d..fce3d19 100755
--- a/usr/local/www/diag_dump_states.php
+++ b/usr/local/www/diag_dump_states.php
@@ -67,8 +67,6 @@ include("head.inc");
 
 <body link="#0000CC" vlink="#0000CC" alink="#0000CC" onload="<?=$jsevents["body"]["onload"];?>">
 <script src="/javascript/sorttable.js" type="text/javascript"></script>
-<script src="/javascript/scriptaculous/prototype.js" type="text/javascript"></script>
-<script src="/javascript/scriptaculous/scriptaculous.js" type="text/javascript"></script>
 <?php include("fbegin.inc"); ?>
 <form action="diag_dump_states.php" method="get" name="iform">
 
diff --git a/usr/local/www/diag_logs_filter_dynamic.php b/usr/local/www/diag_logs_filter_dynamic.php
index f9ea26c..21511ec 100755
--- a/usr/local/www/diag_logs_filter_dynamic.php
+++ b/usr/local/www/diag_logs_filter_dynamic.php
@@ -180,8 +180,6 @@ include("head.inc");
 ?>
 <body link="#0000CC" vlink="#0000CC" alink="#0000CC">
 <?php include("fbegin.inc"); ?>
-<script src="/javascript/scriptaculous/prototype.js" type="text/javascript"></script>
-<script src="/javascript/scriptaculous/scriptaculous.js" type="text/javascript"></script>
 <script language="javascript">
 	lastsawtime = '<?php echo time(); ?>;';
 	var lines = Array();
diff --git a/usr/local/www/diag_system_activity.php b/usr/local/www/diag_system_activity.php
index 435234b..3529d48 100644
--- a/usr/local/www/diag_system_activity.php
+++ b/usr/local/www/diag_system_activity.php
@@ -71,7 +71,6 @@ include("head.inc");
 	setTimeout('getcpuactivity()', 1000);	
 </script>
 <div id='maincontent'>
-<script src="/javascript/scriptaculous/prototype.js" type="text/javascript"></script>
 <?php
 	include("fbegin.inc"); 
 	if(strstr($pfSversion, "1.2")) 
diff --git a/usr/local/www/diag_system_pftop.php b/usr/local/www/diag_system_pftop.php
index 3f322ad..78fdbe5 100644
--- a/usr/local/www/diag_system_pftop.php
+++ b/usr/local/www/diag_system_pftop.php
@@ -79,7 +79,6 @@ else
 	setTimeout('getcpuactivity()', 1000);	
 </script>
 <div id='maincontent'>
-<script src="/javascript/scriptaculous/prototype.js" type="text/javascript"></script>
 <?php
 	include("fbegin.inc"); 
 	if(strstr($pfSversion, "1.2")) 
diff --git a/usr/local/www/edit.php b/usr/local/www/edit.php
index 7206d21..32d2b2f 100755
--- a/usr/local/www/edit.php
+++ b/usr/local/www/edit.php
@@ -71,9 +71,6 @@ if($_REQUEST['action']) {
 
 require("head.inc");
 outputCSSFileInline("code-syntax-highlighter/SyntaxHighlighter.css");
-outputJavaScriptFileInline("javascript/scriptaculous/prototype.js");
-outputJavaScriptFileInline("javascript/scriptaculous/scriptaculous.js");
-outputJavaScriptFileInline("javascript/scriptaculous/effects.js");
 outputJavaScriptFileInline("filebrowser/browser.js");
 
 ?>
diff --git a/usr/local/www/firewall_nat_1to1_edit.php b/usr/local/www/firewall_nat_1to1_edit.php
index 155196a..cec2cad 100755
--- a/usr/local/www/firewall_nat_1to1_edit.php
+++ b/usr/local/www/firewall_nat_1to1_edit.php
@@ -154,7 +154,6 @@ include("head.inc");
 ?>
 
 <body link="#0000CC" vlink="#0000CC" alink="#0000CC">
-<script src="/javascript/scriptaculous/prototype.js" type="text/javascript"></script>
 <?php include("fbegin.inc"); ?>
 <?php if ($input_errors) print_input_errors($input_errors); ?>
             <form action="firewall_nat_1to1_edit.php" method="post" name="iform" id="iform">
diff --git a/usr/local/www/head.inc b/usr/local/www/head.inc
index ee45ace..c4e0006 100755
--- a/usr/local/www/head.inc
+++ b/usr/local/www/head.inc
@@ -49,7 +49,10 @@ $pagetitle = gentitle( $pgtitle );
 			outputJavaScriptFileInline("javascript/pi.js");
 			outputJavaScriptFileInline("javascript/firebug-lite.js");
 		}
-
+		outputJavaScriptFileInline("/javascript/scriptaculous/prototype.js");
+		outputJavaScriptFileInline("/javascript/scriptaculous/scriptaculous.js");
+		outputJavaScriptFileInline("/javascript/scriptaculous/effects.js");
+		
 	/*
 	 *	Find all javascript files that need to be included
 	 *	for this page ... from the arrays ... :)
diff --git a/usr/local/www/index.php b/usr/local/www/index.php
index 498e04c..4d66958 100755
--- a/usr/local/www/index.php
+++ b/usr/local/www/index.php
@@ -436,21 +436,10 @@ $closehead = false;
 $pgtitle = array("{$g['product_name']} Dashboard");
 include("head.inc");
 
-?>
-
-<script type="text/javascript" language="javascript" src="/javascript/scriptaculous/prototype.js"></script>
-<script type="text/javascript" language="javascript" src="/javascript/scriptaculous/scriptaculous.js"></script>
-
-<?php
-
 outputJavaScriptFileInline("javascript/domTT/domLib.js");
 outputJavaScriptFileInline("javascript/domTT/domTT.js");
 outputJavaScriptFileInline("javascript/domTT/behaviour.js");
 outputJavaScriptFileInline("javascript/domTT/fadomatic.js");
-//echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript/domTT/domLib.js\"></script>";
-//echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript/domTT/domTT.js\"></script>";
-//echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript/domTT/behaviour.js\"></script>";
-//echo "<script type=\"text/javascript\" language=\"javascript\" src=\"/javascript/domTT/fadomatic.js\"></script>";
 ?>
 
 <body link="#0000CC" vlink="#0000CC" alink="#0000CC">
diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php
index c14e6be..5f9f2ed 100755
--- a/usr/local/www/interfaces.php
+++ b/usr/local/www/interfaces.php
@@ -683,8 +683,6 @@ $types = array("none" => "None", "static" => "Static", "dhcp" => "DHCP", "pppoe"
 <link href="/javascript/numericupdown/css/numericupdown.css" rel="stylesheet" type="text/css" />
 <script type="text/javascript" src="/javascript/datepicker/js/datepicker.js"></script>
 <link href="/javascript/datepicker/css/datepicker.css" rel="stylesheet" type="text/css"/>
-<script type="text/javascript" src="/javascript/scriptaculous/prototype.js"></script>
-<script type="text/javascript" src="/javascript/scriptaculous/scriptaculous.js"></script>
 
 <script type="text/javascript">
 	function updateType(t){
diff --git a/usr/local/www/interfaces_wan.php b/usr/local/www/interfaces_wan.php
index 4854df5..562dd50 100755
--- a/usr/local/www/interfaces_wan.php
+++ b/usr/local/www/interfaces_wan.php
@@ -551,9 +551,6 @@ include("head.inc");
 <script type="text/javascript" src="/javascript/datepicker/js/datepicker.js"></script>
 <link href="/javascript/datepicker/css/datepicker.css" rel="stylesheet" type="text/css" />
 
-<script type="text/javascript" src="/javascript/scriptaculous/prototype.js"></script>
-<script type="text/javascript" src="/javascript/scriptaculous/scriptaculous.js"></script>
-
 <script type="text/javascript">
 <!--
 
diff --git a/usr/local/www/load_balancer_monitor_edit.php b/usr/local/www/load_balancer_monitor_edit.php
index 8d1e238..82ef06d 100755
--- a/usr/local/www/load_balancer_monitor_edit.php
+++ b/usr/local/www/load_balancer_monitor_edit.php
@@ -186,18 +186,11 @@ if ($_POST) {
 
 $pgtitle = array("Services", "Load Balancer","Monitor","Edit");
 include("head.inc");
+$types = array("icmp" => "ICMP", "tcp" => "TCP", "http" => "HTTP", "https" => "HTTPS", "send" => "Send/Expect");
 
 ?>
 
 <body link="#0000CC" vlink="#0000CC" alink="#0000CC">
-<!-- <script type="text/javascript" language="javascript" src="mon.js"></script> -->
-
-<script src="/javascript/scriptaculous/prototype.js" type="text/javascript"></script>
-<script src="/javascript/scriptaculous/scriptaculous.js" type="text/javascript"></script>
-
-<?php
-	$types = array("icmp" => "ICMP", "tcp" => "TCP", "http" => "HTTP", "https" => "HTTPS", "send" => "Send/Expect");
-?>
 
 <script language="javascript">
 function updateType(t){
diff --git a/usr/local/www/load_balancer_relay_action_edit.php b/usr/local/www/load_balancer_relay_action_edit.php
index aecc353..36c640c 100755
--- a/usr/local/www/load_balancer_relay_action_edit.php
+++ b/usr/local/www/load_balancer_relay_action_edit.php
@@ -175,18 +175,10 @@ if ($_POST) {
 
 $pgtitle = array("Services", "Load Balancer","Relay Action","Edit");
 include("head.inc");
-
+	$types = array("http" => "HTTP", "tcp" => "TCP", "dns" => "DNS");
 ?>
 
 <body link="#0000CC" vlink="#0000CC" alink="#0000CC">
-<!-- <script type="text/javascript" language="javascript" src="mon.js"></script> -->
-
-<script src="/javascript/scriptaculous/prototype.js" type="text/javascript"></script>
-<script src="/javascript/scriptaculous/scriptaculous.js" type="text/javascript"></script>
-
-<?php
-	$types = array("http" => "HTTP", "tcp" => "TCP", "dns" => "DNS");
-?>
 
 <script language="javascript">
 
diff --git a/usr/local/www/load_balancer_relay_protocol_edit.php b/usr/local/www/load_balancer_relay_protocol_edit.php
index b68721c..dd5d456 100755
--- a/usr/local/www/load_balancer_relay_protocol_edit.php
+++ b/usr/local/www/load_balancer_relay_protocol_edit.php
@@ -131,17 +131,12 @@ if ($_POST) {
 $pgtitle = array("Services", "Load Balancer","Relay Protocol","Edit");
 include("head.inc");
 
+$types = array("http" => "HTTP", "tcp" => "TCP", "dns" => "DNS");
 ?>
-
 <body link="#0000CC" vlink="#0000CC" alink="#0000CC">
-<script src="/javascript/scriptaculous/prototype.js" type="text/javascript"></script>
-<script src="/javascript/scriptaculous/scriptaculous.js" type="text/javascript"></script>
 <script type="text/javascript" language="javascript" src="load_balancer_relay_protocol_edit.js"></script>
 
 
-<?php
-	$types = array("http" => "HTTP", "tcp" => "TCP", "dns" => "DNS");
-?>
 
 <script language="javascript">
 function updateType(t){
diff --git a/usr/local/www/load_balancer_virtual_server_edit.php b/usr/local/www/load_balancer_virtual_server_edit.php
index 01231ed..d62b765 100755
--- a/usr/local/www/load_balancer_virtual_server_edit.php
+++ b/usr/local/www/load_balancer_virtual_server_edit.php
@@ -129,8 +129,6 @@ include("head.inc");
 ?>
 
 <body link="#0000CC" vlink="#0000CC" alink="#0000CC">
-<script src="/javascript/scriptaculous/prototype.js" type="text/javascript"></script>
-<script src="/javascript/scriptaculous/scriptaculous.js" type="text/javascript"></script>
 <script language="javascript" type="text/javascript">
 function updateRelay(m) {
   switch (m) {
diff --git a/usr/local/www/pkg_edit.php b/usr/local/www/pkg_edit.php
index 24f0b4e..9ab2c1e 100755
--- a/usr/local/www/pkg_edit.php
+++ b/usr/local/www/pkg_edit.php
@@ -290,8 +290,6 @@ foreach ($pkg['fields']['field'] as $field) {
 <?php include("fbegin.inc"); ?>
 <?php if (!empty($input_errors)) print_input_errors($input_errors); ?>
 <form name="iform" action="pkg_edit.php" method="post">
-<script src="/javascript/scriptaculous/prototype.js" type="text/javascript"></script>
-<script src="/javascript/scriptaculous/scriptaculous.js" type="text/javascript"></script>
 <input type="hidden" name="xml" value="<?= $xml ?>">
 <?php if ($savemsg) print_info_box($savemsg); ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
diff --git a/usr/local/www/status_filter_reload.php b/usr/local/www/status_filter_reload.php
index 238109c..cf93aeb 100644
--- a/usr/local/www/status_filter_reload.php
+++ b/usr/local/www/status_filter_reload.php
@@ -49,12 +49,9 @@ if($_GET['getstatus']) {
 }
 
 include("head.inc");
-
 ?>
 
 <body link="#0000CC" vlink="#0000CC" alink="#0000CC">
-<script src="/javascript/scriptaculous/prototype.js" type="text/javascript"></script>
-<script src="/javascript/scriptaculous/scriptaculous.js" type="text/javascript"></script>
 
 <?php include("fbegin.inc"); ?>
 
diff --git a/usr/local/www/status_queues.php b/usr/local/www/status_queues.php
index ce445a5..ac2f78b 100755
--- a/usr/local/www/status_queues.php
+++ b/usr/local/www/status_queues.php
@@ -112,7 +112,6 @@ if(!is_array($config['shaper']['queue']) && count($config['shaper']['queue']) <
 ?>
 
 <form action="status_queues.php" method="post">
-<script src="/javascript/scriptaculous/prototype.js" type="text/javascript"></script>
 <script type="text/javascript">
         function getqueueactivity() {
                 var url = "/status_queues.php";
diff --git a/usr/local/www/status_rrd_graph.php b/usr/local/www/status_rrd_graph.php
index facc807..a4a07c6 100755
--- a/usr/local/www/status_rrd_graph.php
+++ b/usr/local/www/status_rrd_graph.php
@@ -104,8 +104,6 @@ $pgtitle = array("Status","RRD Graphs");
 include("head.inc");
 
 ?>
-<script src="/javascript/scriptaculous/prototype.js" type="text/javascript"></script>
-<script src="/javascript/scriptaculous/scriptaculous.js" type="text/javascript"></script>
 <body link="#0000CC" vlink="#0000CC" alink="#0000CC">
 <?php include("fbegin.inc"); ?>
 <table width="100%" border="0" cellpadding="0" cellspacing="0">
diff --git a/usr/local/www/status_rrd_graph_settings.php b/usr/local/www/status_rrd_graph_settings.php
index 744a905..a0a66ba 100755
--- a/usr/local/www/status_rrd_graph_settings.php
+++ b/usr/local/www/status_rrd_graph_settings.php
@@ -78,8 +78,6 @@ $pgtitle = array("Status","RRD Graphs");
 include("head.inc");
 
 ?>
-<script src="/javascript/scriptaculous/prototype.js" type="text/javascript"></script>
-<script src="/javascript/scriptaculous/scriptaculous.js" type="text/javascript"></script>
 <body link="#0000CC" vlink="#0000CC" alink="#0000CC">
 <?php include("fbegin.inc"); ?>
 <?php if ($input_errors) print_input_errors($input_errors); ?>
diff --git a/usr/local/www/system_firmware_check.php b/usr/local/www/system_firmware_check.php
index e85fb21..805b84e 100755
--- a/usr/local/www/system_firmware_check.php
+++ b/usr/local/www/system_firmware_check.php
@@ -48,8 +48,6 @@ include("head.inc");
 
 ?>
 
-<script src="/javascript/scriptaculous/prototype.js" type="text/javascript"></script>
-
 <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 <link href="all.css" rel="stylesheet" type="text/css">
 </head>
diff --git a/usr/local/www/system_firmware_settings.php b/usr/local/www/system_firmware_settings.php
index 0893cbc..8827ef3 100755
--- a/usr/local/www/system_firmware_settings.php
+++ b/usr/local/www/system_firmware_settings.php
@@ -64,8 +64,6 @@ if(file_exists("/tmp/manifest")) {
 }
 
 ?>
-<script src="/javascript/scriptaculous/prototype.js" type="text/javascript"></script>
-<script src="/javascript/scriptaculous/scriptaculous.js" type="text/javascript"></script>
 <script language="JavaScript">
 <!--
author	Bill Marquette <bill.marquette@gmail.com>	2009-03-13 01:03:20 -0500
committer	Bill Marquette <bill.marquette@gmail.com>	2009-03-13 01:04:26 -0500
commit	2e069686fb867be9aedd3d39cecc57806f9c2af1 (patch)
tree	4ff480a22419ca4bc66f5e250c695bcab71a85a9 /usr/local
parent	6327599dc2654f2f72a38d540a2e415f04fa93a0 (diff)
download	pfsense-2e069686fb867be9aedd3d39cecc57806f9c2af1.zip pfsense-2e069686fb867be9aedd3d39cecc57806f9c2af1.tar.gz