Major confirmation form standardization and QA phase III

HTML5 requires sane forms. Let's make all forms sane then.
routenull0 · May 31, 2015 · 1cdb8da · 1cdb8da
1 parent d4b5c8d
commit 1cdb8da
Show file tree

Hide file tree

Showing 27 changed files with 118 additions and 58 deletions.
diff --git a/aggregate_graphs.php b/aggregate_graphs.php
@@ -330,10 +330,10 @@ function form_actions() {
 	/* add a list of tree names to the actions dropdown */
 	add_tree_names_to_actions_array();
 
-	html_start_box('<strong>' . $graph_actions{$_POST['drp_action']} . '</strong>', '60%', '', '3', 'center', '');
-
 	print "<form action='aggregate_graphs.php' method='post'>\n";
 
+	html_start_box('<strong>' . $graph_actions{$_POST['drp_action']} . '</strong>', '60%', '', '3', 'center', '');
+
 	if (isset($graph_array) && sizeof($graph_array)) {
 		if ($_POST['drp_action'] == '1') { /* delete */
 			print "<tr>
@@ -472,6 +472,8 @@ function form_actions() {
 
 	html_end_box(false);
 
+	print "</form>\n";
+
 	bottom_footer();
 }
 

diff --git a/automation_graph_rules.php b/automation_graph_rules.php
@@ -303,6 +303,8 @@ function automation_graph_rules_form_actions() {
 
 	html_end_box();
 
+	print "</form>\n";
+
 	bottom_footer();
 }
 

diff --git a/automation_networks.php b/automation_networks.php
@@ -275,10 +275,10 @@ function form_actions() {
 
 	top_header();
 
-	html_start_box('<strong>' . $network_actions{$_POST['drp_action']} . '</strong>', '60%', $colors['header_panel'], '3', 'center', '');
-
 	print "<form action='automation_networks.php' method='post'>\n";
 
+	html_start_box('<strong>' . $network_actions{$_POST['drp_action']} . '</strong>', '60%', $colors['header_panel'], '3', 'center', '');
+
 	if ($_POST['drp_action'] == '1') { /* delete */
 		print "<tr>
 			<td class='textArea'>
@@ -335,6 +335,8 @@ function form_actions() {
 
 	html_end_box();
 
+	print "</form>\n";
+
 	bottom_footer();
 }
 

diff --git a/automation_snmp.php b/automation_snmp.php
@@ -247,6 +247,8 @@ function goTo(location) {
 
 	html_end_box();
 
+	print "</form>\n";
+
 	bottom_footer();
 }
 

diff --git a/automation_tree_rules.php b/automation_tree_rules.php
@@ -309,6 +309,8 @@ function automation_tree_rules_form_actions() {
 
 	html_end_box();
 
+	print "</form>\n";
+
 	bottom_footer();
 }
 
@@ -553,8 +555,8 @@ function automation_tree_rules_edit() {
 	if (isset($_REQUEST['tree_item_id'])) {$rule['tree_item_id'] = $_REQUEST['tree_item_id'];}
 
 	print "<form method='post' action='automation_tree_rules.php' name='form_automation_tree_rule_edit'>";
+
 	html_start_box("<strong>Tree Rule Selection</strong> $header_label", '100%', '', '3', 'center', '');
-	#print '<pre>'; print_r($_POST); print_r($_GET); print_r($_REQUEST); print '</pre>';
 
 	if (!empty($_GET['id'])) {
 		/* display whole rule */

diff --git a/cdef.php b/cdef.php
@@ -240,6 +240,8 @@ function form_actions() {
 
 	html_end_box();
 
+	print "</form>\n";
+
 	bottom_footer();
 }
 

diff --git a/color_templates.php b/color_templates.php
@@ -204,6 +204,7 @@ function aggregate_color_form_actions() {
 	top_header();
 
 	print "<form action='color_templates.php' method='post'>\n";
+
 	html_start_box('<strong>' . $aggregate_actions{$_POST['drp_action']} . '</strong>', '60%', '', '3', 'center', '');
 
 	if (isset($color_array) && sizeof($color_array)) {

diff --git a/data_input.php b/data_input.php
@@ -192,10 +192,10 @@ function form_actions() {
 
 	top_header();
 
-	html_start_box('<strong>' . $di_actions{$_POST['drp_action']} . '</strong>', '60%', '', '3', 'center', '');
-
 	print "<form action='data_input.php' method='post'>\n";
 
+	html_start_box('<strong>' . $di_actions{$_POST['drp_action']} . '</strong>', '60%', '', '3', 'center', '');
+
 	if (isset($di_array) && sizeof($di_array)) {
 		if ($_POST['drp_action'] == '1') { /* delete */
 			$graphs = array();
@@ -225,6 +225,8 @@ function form_actions() {
 
 	html_end_box();
 
+	print "</form>\n";
+
 	bottom_footer();
 }
 

diff --git a/data_queries.php b/data_queries.php
@@ -243,10 +243,10 @@ function form_actions() {
 
 	top_header();
 
-	html_start_box('<strong>' . $dq_actions{$_POST['drp_action']} . '</strong>', '60%', '', '3', 'center', '');
-
 	print "<form action='data_queries.php' method='post'>\n";
 
+	html_start_box('<strong>' . $dq_actions{$_POST['drp_action']} . '</strong>', '60%', '', '3', 'center', '');
+
 	if (isset($dq_array) && sizeof($dq_array)) {
 		if ($_POST['drp_action'] == '1') { /* delete */
 			$graphs = array();
@@ -276,6 +276,8 @@ function form_actions() {
 
 	html_end_box();
 
+	print "</form>\n";
+
 	bottom_footer();
 }
 

diff --git a/data_sources.php b/data_sources.php
@@ -450,10 +450,10 @@ function form_actions() {
 
 	top_header();
 
-	html_start_box('<strong>' . $ds_actions{$_POST['drp_action']} . '</strong>', '60%', '', '3', 'center', '');
-
 	print "<form action='data_sources.php' method='post'>\n";
 
+	html_start_box('<strong>' . $ds_actions{$_POST['drp_action']} . '</strong>', '60%', '', '3', 'center', '');
+
 	if (isset($ds_array) && sizeof($ds_array)) {
 		if ($_POST['drp_action'] == '1') { /* delete */
 			$graphs = array();
@@ -591,6 +591,8 @@ function form_actions() {
 
 	html_end_box();
 
+	print "</form>\n";
+
 	bottom_footer();
 }
 

diff --git a/data_templates.php b/data_templates.php
@@ -314,10 +314,10 @@ function form_actions() {
 
 	top_header();
 
-	html_start_box('<strong>' . $ds_actions{$_POST['drp_action']} . '</strong>', '60%', '', '3', 'center', '');
-
 	print "<form action='data_templates.php' method='post'>\n";
 
+	html_start_box('<strong>' . $ds_actions{$_POST['drp_action']} . '</strong>', '60%', '', '3', 'center', '');
+
 	if (isset($ds_array) && sizeof($ds_array)) {
 		if ($_POST['drp_action'] == '1') { /* delete */
 			print "<tr>
@@ -357,6 +357,8 @@ function form_actions() {
 
 	html_end_box();
 
+	print "</form>\n";
+
 	bottom_footer();
 }
 

diff --git a/gprint_presets.php b/gprint_presets.php
@@ -160,6 +160,8 @@ function form_actions() {
 
 	html_end_box();
 
+	print "</form>\n";
+
 	bottom_footer();
 }
 

diff --git a/graph_templates.php b/graph_templates.php
@@ -226,10 +226,10 @@ function form_actions() {
 
 	top_header();
 
-	html_start_box('<strong>' . $graph_actions{$_POST['drp_action']} . '</strong>', '60%', '', '3', 'center', '');
-
 	print "<form action='graph_templates.php' method='post'>\n";
 
+	html_start_box('<strong>' . $graph_actions{$_POST['drp_action']} . '</strong>', '60%', '', '3', 'center', '');
+
 	if (isset($graph_array) && sizeof($graph_array)) {
 		if ($_POST['drp_action'] == '1') { /* delete */
 			print "<tr>
@@ -269,6 +269,8 @@ function form_actions() {
 
 	html_end_box();
 
+	print "</form>\n";
+
 	bottom_footer();
 }
 

diff --git a/graphs.php b/graphs.php
@@ -569,10 +569,10 @@ function form_actions() {
 	/* add a list of tree names to the actions dropdown */
 	add_tree_names_to_actions_array();
 
-	html_start_box('<strong>' . $graph_actions{$_POST['drp_action']} . '</strong>', '60%', '', '3', 'center', '');
-
 	print "<form action='graphs.php' method='post'>\n";
 
+	html_start_box('<strong>' . $graph_actions{$_POST['drp_action']} . '</strong>', '60%', '', '3', 'center', '');
+
 	if (isset($graph_array) && sizeof($graph_array)) {
 		if ($_POST['drp_action'] == '1') { /* delete */
 			$graphs = array();
@@ -872,6 +872,8 @@ function changeTotalsType() {
 
 	html_end_box();
 
+	print "</form>\n";
+
 	bottom_footer();
 }
 

diff --git a/host.php b/host.php
@@ -437,10 +437,10 @@ function form_actions() {
 	/* add a list of tree names to the actions dropdown */
 	add_tree_names_to_actions_array();
 
-	html_start_box('<strong>' . $device_actions[get_request_var_post('drp_action')] . '</strong>', '60%', '', '3', 'center', '');
-
 	print "<form action='host.php' autocomplete='off' method='post'>\n";
 
+	html_start_box('<strong>' . $device_actions[get_request_var_post('drp_action')] . '</strong>', '60%', '', '3', 'center', '');
+
 	if (isset($host_array) && sizeof($host_array)) {
 		if ($_POST['drp_action'] == '2') { /* Enable Devices */
 			print "<tr>
@@ -596,6 +596,8 @@ function form_actions() {
 
 	html_end_box();
 
+	print "</form>\n";
+
 	bottom_footer();
 }
 

diff --git a/host_templates.php b/host_templates.php
@@ -165,10 +165,10 @@ function form_actions() {
 
 	top_header();
 
-	html_start_box('<strong>' . $host_actions{$_POST['drp_action']} . '</strong>', '60%', '', '3', 'center', '');
-
 	print "<form action='host_templates.php' autocomplete='off' method='post'>\n";
 
+	html_start_box('<strong>' . $host_actions{$_POST['drp_action']} . '</strong>', '60%', '', '3', 'center', '');
+
 	if (isset($host_array) && sizeof($host_array)) {
 		if ($_POST['drp_action'] == '1') { /* delete */
 			print "<tr>
@@ -211,6 +211,8 @@ function form_actions() {
 
 	html_end_box();
 
+	print "</form>\n";
+
 	bottom_footer();
 }
 

diff --git a/include/layout.js b/include/layout.js
@@ -563,9 +563,15 @@ function loadPage(href) {
 function loadPageNoHeader(href) {
 	$.get(href, function(data) {
 		$('#main').html(data);
+
 		applySkin();
+
 		window.scrollTo(0, 0);
+
+		return false;
 	});
+
+	return false;
 }
 
 function ajaxAnchors() {

diff --git a/lib/clog_webapi.php b/lib/clog_webapi.php
@@ -109,38 +109,41 @@ function clog_view_logfile() {
 	general_header();
 
 	if ((isset($_REQUEST['purge'])) && (clog_admin())) {
+		print "<form action='clog.php' autocomplete='off' method='post'>\n";
+
 		html_start_box('<strong>Purge</strong>', '50%', '', '3', 'center', '');
 
-		print "<form action='clog.php' autocomplete='off' method='post'>
-			<tr>
-				<td class='textArea'>
-					<p>Click 'Continue' to purge the Cacti log file.<br><br><br>Note: If logging is set to Cacti and Syslog, the log information will remain in Syslog.</p>
-				</td>
-			</tr>
-			<tr>
-				<td colspan='2' align='right' bgcolor='#eaeaea'>
-					<input id='cancel' type='button' value='Cancel'>&nbsp
-					<input id='pc' type='button' name='purge_continue' value='Continue' title='Purge cacti.log'>
-					<script type='text/javascript'>
-					$('#pc').click(function() {
-						strURL = location.pathname+'?purge_continue=1&header=false';
-						loadPageNoHeader(strURL);
-					});
-
-					$('#cancel').click(function() {
-						strURL = location.pathname+'?header=false';
-						loadPageNoHeader(strURL);
-					});
-
-					$(function() {
-						applySkin();
-					});
-					</script>
-				</td>
-			</tr>\n";
+		print "<tr>
+			<td class='textArea'>
+				<p>Click 'Continue' to purge the Cacti log file.<br><br><br>Note: If logging is set to Cacti and Syslog, the log information will remain in Syslog.</p>
+			</td>
+		</tr>
+		<tr>
+			<td colspan='2' align='right' bgcolor='#eaeaea'>
+				<input id='cancel' type='button' value='Cancel'>&nbsp
+				<input id='pc' type='button' name='purge_continue' value='Continue' title='Purge cacti.log'>
+				<script type='text/javascript'>
+				$('#pc').click(function() {
+					strURL = location.pathname+'?purge_continue=1&header=false';
+					loadPageNoHeader(strURL);
+				});
+
+				$('#cancel').click(function() {
+					strURL = location.pathname+'?header=false';
+					loadPageNoHeader(strURL);
+				});
+
+				$(function() {
+					applySkin();
+				});
+				</script>
+			</td>
+		</tr>\n";
 
 		html_end_box();
 
+		print "</form>\n";
+
 		return;	
 	}
 

diff --git a/lib/html.php b/lib/html.php
@@ -993,6 +993,7 @@ function loadActionsPage() {
 		$.post(strURL, variables).done(function(data) {
 			$('#main').html(data);
 			applySkin();
+			window.scrollTo(0, 0);
 		});
 		return false;
 	}

diff --git a/lib/html_reports.php b/lib/html_reports.php
@@ -744,6 +744,8 @@ function goTo(location) {
 
 	html_end_box();
 
+	print "</form>\n";
+
 	bottom_footer();
 }
 

diff --git a/lib/html_utility.php b/lib/html_utility.php
@@ -145,7 +145,7 @@ function form_alternate_row($row_id = '', $light = false, $disabled = false) {
    @arg $width - the width of the table element
    @arg $style - the style to apply to the table element */
 function form_selectable_cell($contents, $id, $width='', $style='') {
-	print "\t<td style='width:$width;$style;'>" . $contents . "</td>\n";
+	print "\t<td " . ($width != '' || $style != "" ? "style='" . ($width != '' ? "width:$width;":"") . ($style != '' ? "$style;'":"'"):"") . ">" . $contents . "</td>\n";
 }
 
 /* form_checkbox_cell - format's a tables checkbox form element so that the cacti js actions work on it
-Original file line number
+Diff line change
@@ Expand Up / @@ -303,6 +303,8 @@ function automation_graph_rules_form_actions() { @@
     	html_end_box();
+    	print "</form>\n";
     	bottom_footer();
     }
@@ Expand Down @@