Improved infoblock system no longer needs sufficies if more than one per page

Removed long commented out script

8 files changed, 21 insertions, 29 deletions

diff --git a/src/usr/local/www/diag_confbak.php b/src/usr/local/www/diag_confbak.php
index a14bdcd..56afc59 100644
--- a/src/usr/local/www/diag_confbak.php
+++ b/src/usr/local/www/diag_confbak.php
@@ -208,7 +208,7 @@ print($form);
 if (is_array($confvers)) {
 ?>
 <div>
-	<div class="infoblock_open">
+	<div class="infoblock blockopen">
 		<?=print_info_box(
 			gettext(
 				'To view the differences between an older configuration and a newer configuration, ' .
diff --git a/src/usr/local/www/diag_tables.php b/src/usr/local/www/diag_tables.php
index 1eaa306..a90442a 100644
--- a/src/usr/local/www/diag_tables.php
+++ b/src/usr/local/www/diag_tables.php
@@ -159,7 +159,7 @@ print $form;
 if ($bogons || !empty($entries)) {
 ?>
 <div>
-	<div class="infoblock_open">
+	<div class="infoblock blockopen">
 <?php
 	$last_updated = exec('/usr/bin/grep -i -m 1 -E "^# last updated" /etc/' . escapeshellarg($tablename) . '|cut -d"(" -f2|tr -d ")" ');
 	if ($last_updated != "") {
diff --git a/src/usr/local/www/jquery/pfSenseHelpers.js b/src/usr/local/www/jquery/pfSenseHelpers.js
index f447b65..ebf00e0 100644
--- a/src/usr/local/www/jquery/pfSenseHelpers.js
+++ b/src/usr/local/www/jquery/pfSenseHelpers.js
@@ -387,25 +387,29 @@ $('[id^=delete]').click(function(event) {
 // "More information" handlers --------------------------------------------------------------------
 
 // If there is an infoblock, automatically add an info icon that toggles its display
-// If there is n=more than one infoblock on a page, each must use a unique class suffic. e.g.: infoblock_01 or infoblock_open_19
 
-$('[class^="infoblock"], [class^="infoblock_open"]').each(function() {
-	var classname = $(this).attr("class");
-	var sfx = classname.substr(9);
+var sfx = 0;
 
-	if (classname.indexOf("infoblock_open") == -1) {
+$('.infoblock').each(function() {
+	// If the block has hte class "blockopen" it is initiall open
+	if (! $(this).hasClass("blockopen")) {
 		$(this).hide();
+	} else {
+		$(this).removeClass("blockopen");
 	}
 
-	$(this).before('<i class="fa fa-info-circle icon-pointer" style="color: #337AB7; font-size:20px; margin-left: 10px; margin-bottom: 10px;" id="showinfo' + sfx + '" title="More information"></i>');
+	// Add the "i" icon before the infoblock, incrementing hte icon id for each block (in case there are multiple infoblocks on a page)
+	$(this).before('<i class="fa fa-info-circle icon-pointer" style="color: #337AB7; font-size:20px; margin-left: 10px; margin-bottom: 10px;" id="showinfo' + sfx.toString() + '" title="More information"></i>');
+	$(this).removeClass("infoblock");
+	$(this).addClass("infoblock" + sfx.toString());
+	sfx++;
 });
 
 // Show the help on clicking the info icon
 $('[id^="showinfo"]').click(function() {
 	var id = $(this).attr("id");
-	var target = "infoblock" + id.substr(8);
 
-	$('.' + target).toggle();
+	$('.' + "infoblock" + id.substr(8)).toggle();
 });
 // ------------------------------------------------------------------------------------------------
 
diff --git a/src/usr/local/www/services_dhcpv6.php b/src/usr/local/www/services_dhcpv6.php
index 84c299d..dc58ba2 100644
--- a/src/usr/local/www/services_dhcpv6.php
+++ b/src/usr/local/www/services_dhcpv6.php
@@ -888,7 +888,7 @@ $section->addInput(new Form_Input(
 
 print($form);
 ?>
-<div class="infoblock_open">
+<div class="infoblock blockopen">
 <?php
 print_info_box(gettext('The DNS servers entered in ') . '<a href="system.php">' . gettext(' System: General setup') . '</a>' .
 			   gettext(' (or the ') . '<a href="services_dnsmasq.php"/>' . gettext('DNS forwarder') . '</a>, ' . gettext('if enabled) ') .
diff --git a/src/usr/local/www/services_dnsmasq.php b/src/usr/local/www/services_dnsmasq.php
index c46ffa7..72fbc50 100644
--- a/src/usr/local/www/services_dnsmasq.php
+++ b/src/usr/local/www/services_dnsmasq.php
@@ -342,7 +342,7 @@ $section->addInput(new Form_Textarea(
 $form->add($section);
 print($form);
 ?>
-<div class="infoblock_open_01">
+<div class="infoblock blockopen">
 <?php
 print_info_box(sprintf("If the DNS forwarder is enabled, the DHCP".
 	" service (if enabled) will automatically serve the LAN IP".
@@ -433,7 +433,7 @@ endforeach;
 	</a>
 </nav>
 
-<div class="infoblock_open_02">
+<div class="infoblock blockopen">
 <?php
 print_info_box(gettext("Entries in this section override individual results from the forwarders.") .
 				gettext("Use these for changing DNS results or for adding custom DNS records."), 'info', false);
@@ -487,19 +487,7 @@ endforeach;
 	</a>
 </nav>
 
-<script type="text/javascript">
-//<![CDATA[
-events.push(function() {
-	// On clicking the "Apply" button, submit the main form, not the little form the button lives in
-//	$('[name=apply]').prop('type', 'button');
-
-//    $('[name=apply]').click(function() {
-//        $('form:last').submit();
-//    });
-// });
-//]]>
-</script>
-<div class="infoblock_open_03">
+<div class="infoblock blockopen">
 <?php
 print_info_box(gettext("Entries in this area override an entire domain, and subdomains, by specifying an".
 						" authoritative DNS server to be queried for that domain."), 'info', false);
diff --git a/src/usr/local/www/services_wol.php b/src/usr/local/www/services_wol.php
index 606234f..a139000 100644
--- a/src/usr/local/www/services_wol.php
+++ b/src/usr/local/www/services_wol.php
@@ -146,7 +146,7 @@ if ($_GET['act'] == "del") {
 $pgtitle = array(gettext("Services"), gettext("Wake on LAN"));
 include("head.inc");
 ?>
-<div class="infoblock_open">
+<div class="infoblock blockopen">
 <?php
 print_info_box(gettext('This service can be used to wake up (power on) computers by sending special') . ' "' . gettext('Magic Packets') . '"<br />' .
 			   gettext('The NIC in the computer that is to be woken up must support Wake on LAN and must be properly configured (WOL cable, BIOS settings).'),
diff --git a/src/usr/local/www/status_logs_filter_summary.php b/src/usr/local/www/status_logs_filter_summary.php
index 9830167..416bcd8 100644
--- a/src/usr/local/www/status_logs_filter_summary.php
+++ b/src/usr/local/www/status_logs_filter_summary.php
@@ -157,7 +157,7 @@ print("<br />");
 $infomsg = sprintf(gettext('This is a summary of the last %1$s lines of the firewall log (Max %2$s).'), $gotlines, $lines);
 ?>
 <div>
-	<div class="infoblock_open">
+	<div class="infoblock blockopen">
 		<?=print_info_box($infomsg, 'info', false);?>
 	</div>
 </div>
diff --git a/src/usr/local/www/status_queues.php b/src/usr/local/www/status_queues.php
index 64ade5d..47a5e21 100644
--- a/src/usr/local/www/status_queues.php
+++ b/src/usr/local/www/status_queues.php
@@ -212,7 +212,7 @@ else: ?>
 				</tbody>
 			</table>
 			<br />
-			<div class="infoblock_open">
+			<div class="infoblock blockopen">
 <?php
 	print_info_box(gettext("Queue graphs take 5 seconds to sample data"), 'info');
 ?>