Merge pull request #2440 from phil-davis/panel-heading

14 files changed, 60 insertions, 47 deletions

diff --git a/src/usr/local/www/crash_reporter.php b/src/usr/local/www/crash_reporter.php
index 2c9ffc1..9c5cd80 100644
--- a/src/usr/local/www/crash_reporter.php
+++ b/src/usr/local/www/crash_reporter.php
@@ -151,7 +151,7 @@ exec("/usr/bin/grep -vi warning /tmp/PHP_errors.log", $php_errors);
 		}
 ?>
 	<div class="panel panel-default">
-		<div class="panel-heading"><?=gettext("Unfortunately we have detected a programming bug.")?></div>
+		<div class="panel-heading"><h2 class="panel-title"><?=gettext("Unfortunately we have detected a programming bug.")?></h2></div>
 		<div class="panel-body">
 			<div class="content">
 				<p>
diff --git a/src/usr/local/www/diag_confbak.php b/src/usr/local/www/diag_confbak.php
index 56afc59..bb67309 100644
--- a/src/usr/local/www/diag_confbak.php
+++ b/src/usr/local/www/diag_confbak.php
@@ -142,7 +142,11 @@ if ($savemsg) {
 if ($diff) {
 ?>
 <div class="panel panel-default">
-	<div class="panel-heading"><?=gettext("Configuration diff from ")?><?=date(gettext("n/j/y H:i:s"), $oldtime); ?><?=gettext(" to ")?><?=date(gettext("n/j/y H:i:s"), $newtime); ?></div>
+	<div class="panel-heading">
+		<h2 class="panel-title">
+			<?=gettext("Configuration diff from ")?><?=date(gettext("n/j/y H:i:s"), $oldtime); ?><?=gettext(" to ")?><?=date(gettext("n/j/y H:i:s"), $newtime); ?>
+		</h2>
+	</div>
 	<div class="panel-body table-responsive">
 	<!-- This table is left un-bootstrapped to maintain the original diff format output -->
 		<table style="padding-top: 4px; padding-bottom: 4px; vertical-align:middle;">
diff --git a/src/usr/local/www/diag_gmirror.php b/src/usr/local/www/diag_gmirror.php
index 3dffd29..41ddff0 100644
--- a/src/usr/local/www/diag_gmirror.php
+++ b/src/usr/local/www/diag_gmirror.php
@@ -207,7 +207,7 @@ if ($_GET["error"] && ($_GET["error"] != 0)) {
 <?php
 if ($_GET["action"]):  ?>
 	<div class="panel panel-default">
-		<div class="panel-heading">Confirm Action</div>
+		<div class="panel-heading"><h2 class="panel-title"><?=gettext('Confirm Action')?></h2></div>
 		<div class="panel-body">
 			<strong><?=gettext('Please confirm the selected action: '); ?></strong>
 			<span style="color:green"><?=$action_list[$_GET["action"]]; ?></span>
@@ -239,7 +239,7 @@ else:
 
 	<!-- GEOM mirror table -->
 	<div class="panel panel-default">
-		<div class="panel-heading">GEOM Mirror information - Mirror Status</div>
+		<div class="panel-heading"><h2 class="panel-title"><?=gettext('GEOM Mirror information - Mirror Status')?></h2></div>
 		<div class="panel-body table-responsive">
 
 <?php
@@ -321,7 +321,7 @@ else:
 
 	<!-- Consumer information table -->
 	<div class="panel panel-default">
-		<div class="panel-heading">Consumer information - Available consumers</div>
+		<div class="panel-heading"><h2 class="panel-title"><?=gettext('Consumer information - Available consumers')?></h2></div>
 		<div class="panel-body table-responsive">
 <?php
 	if (count($unused_consumers) > 0): ?>
diff --git a/src/usr/local/www/exec.php b/src/usr/local/www/exec.php
index f4bbd7f..b7ebca0 100644
--- a/src/usr/local/www/exec.php
+++ b/src/usr/local/www/exec.php
@@ -286,7 +286,7 @@ if (!isBlank($_POST['txtCommand'])):?>
 	// Experimental version. Writes the user's php code to a file and executes it via a new instance of PHP
 	// This is intended to prevent bad code from breaking the GUI
 	if (!isBlank($_POST['txtPHPCommand'])) {
-		puts("<div class=\"panel panel-success responsive\"><div class=\"panel-heading\">PHP response</div>");
+		puts("<div class=\"panel panel-success responsive\"><div class=\"panel-heading\"><h2 class=\"panel-title\">PHP response</h2></div>");
 
 		$tmpname = tempnam("/tmp", "");
 		$phpfile = fopen($tmpname, "w");
diff --git a/src/usr/local/www/firewall_nat.php b/src/usr/local/www/firewall_nat.php
index ec95ef1..4a6f2f2 100644
--- a/src/usr/local/www/firewall_nat.php
+++ b/src/usr/local/www/firewall_nat.php
@@ -188,7 +188,7 @@ display_top_tabs($tab_array);
 
 <form action="firewall_nat.php" method="post" name="iform">
 	<div class="panel panel-default">
-		<div class="panel-heading"><?=gettext('Rules')?></div>
+		<div class="panel-heading"><h2 class="panel-title"><?=gettext('Rules')?></h2></div>
 		<div class="panel-body table-responsive">
 			<table class="table table-striped table-hover table-condensed">
 				<thead>
diff --git a/src/usr/local/www/firewall_nat_1to1.php b/src/usr/local/www/firewall_nat_1to1.php
index 2e15ac4..4be8a9e 100644
--- a/src/usr/local/www/firewall_nat_1to1.php
+++ b/src/usr/local/www/firewall_nat_1to1.php
@@ -173,7 +173,7 @@ display_top_tabs($tab_array);
 ?>
 <form action="firewall_nat_1to1.php" method="post">
 	<div class="panel panel-default">
-		<div class="panel-heading"><?=gettext("NAT 1 to 1 mappings")?></div>
+		<div class="panel-heading"><h2 class="panel-title"><?=gettext("NAT 1 to 1 mappings")?></h2></div>
 		<div id="mainarea" class="table-responsive panel-body">
 			<table class="table table-striped table-hover table-condensed">
 				<thead>
diff --git a/src/usr/local/www/firewall_nat_out.php b/src/usr/local/www/firewall_nat_out.php
index f5ab98f..20b7098 100644
--- a/src/usr/local/www/firewall_nat_out.php
+++ b/src/usr/local/www/firewall_nat_out.php
@@ -300,7 +300,7 @@ print($form);
 
 <form action="firewall_nat_out.php" method="post" name="iform">
 	<div class="panel panel-default">
-		<div class="panel-heading"><?=gettext('Mappings')?></div>
+		<div class="panel-heading"><h2 class="panel-title"><?=gettext('Mappings')?></h2></div>
 		<div class="panel-body table-responsive">
 			<table class="table table-hover table-striped table-condensed">
 				<thead>
@@ -549,7 +549,7 @@ if ($mode == "automatic" || $mode == "hybrid"):
 	unset($FilterIflist, $GatewaysList);
 ?>
 	<div class="panel panel-default">
-		<div class="panel-heading"><?=gettext("Automatic rules:")?></div>
+		<div class="panel-heading"><h2 class="panel-title"><?=gettext("Automatic rules:")?></h2></div>
 		<div class="panel-body table-responsive">
 			<table class="table table-hover table-striped table-condensed">
 				<thead>
diff --git a/src/usr/local/www/firewall_rules.php b/src/usr/local/www/firewall_rules.php
index 5ba1be9..ae65db4 100644
--- a/src/usr/local/www/firewall_rules.php
+++ b/src/usr/local/www/firewall_rules.php
@@ -274,7 +274,7 @@ display_top_tabs($tab_array);
 ?>
 <form method="post">
 	<div class="panel panel-default">
-		<div class="panel-heading"><?=gettext("Rules (Drag to change order)")?></div>
+		<div class="panel-heading"><h2 class="panel-title"><?=gettext("Rules (Drag to change order)")?></h2></div>
 		<div id="mainarea" class="table-responsive panel-body">
 			<table class="table table-hover table-striped table-condensed">
 				<thead>
diff --git a/src/usr/local/www/index.php b/src/usr/local/www/index.php
index 3582d0d..9ef6373 100644
--- a/src/usr/local/www/index.php
+++ b/src/usr/local/www/index.php
@@ -313,12 +313,14 @@ pfSense_handle_custom_code("/usr/local/pkg/dashboard/pre_dashboard");
 ?>
 
 <div class="panel panel-default" id="widget-available">
-	<div class="panel-heading"><?=gettext("Available Widgets"); ?>
-		<span class="widget-heading-icon">
-			<a data-toggle="collapse" href="#widget-available_panel-body" id="widgets-available">
-				<i class="fa fa-plus-circle"></i>
-			</a>
-		</span>
+	<div class="panel-heading">
+		<h2 class="panel-title"><?=gettext("Available Widgets"); ?>
+			<span class="widget-heading-icon">
+				<a data-toggle="collapse" href="#widget-available_panel-body" id="widgets-available">
+					<i class="fa fa-plus-circle"></i>
+				</a>
+			</span>
+		</h2>
 	</div>
 	<div id="widget-available_panel-body" class="panel-body collapse out">
 		<div class="content">
@@ -390,19 +392,21 @@ foreach ($widgets as $widgetname => $widgetconfig) {
 				?>
 					<div class="panel panel-default" id="widget-<?=$widgetname?>">
 					<div class="panel-heading">
-						<?=$wtitle?>
-						<span class="widget-heading-icon">
-							<a data-toggle="collapse" href="#widget-<?=$widgetname?>_panel-footer" class="config hidden">
-								<i class="fa fa-wrench"></i>
-							</a>
-							<a data-toggle="collapse" href="#widget-<?=$widgetname?>_panel-body">
-								<!--  actual icon is determined in css based on state of body -->
-								<i class="fa fa-plus-circle"></i>
-							</a>
-							<a data-toggle="close" href="#widget-<?=$widgetname?>">
-								<i class="fa fa-times-circle"></i>
-							</a>
-						</span>
+						<h2 class="panel-title">
+							<?=$wtitle?>
+							<span class="widget-heading-icon">
+								<a data-toggle="collapse" href="#widget-<?=$widgetname?>_panel-footer" class="config hidden">
+									<i class="fa fa-wrench"></i>
+								</a>
+								<a data-toggle="collapse" href="#widget-<?=$widgetname?>_panel-body">
+									<!--  actual icon is determined in css based on state of body -->
+									<i class="fa fa-plus-circle"></i>
+								</a>
+								<a data-toggle="close" href="#widget-<?=$widgetname?>">
+									<i class="fa fa-times-circle"></i>
+								</a>
+							</span>
+						</h2>
 					</div>
 					<div id="widget-<?=$widgetname?>_panel-body" class="panel-body collapse<?=($widgetconfig['display'] == 'close' ? '' : ' in')?>">
 						<?php include('/usr/local/www/widgets/widgets/'. $widgetname.'.widget.php'); ?>
diff --git a/src/usr/local/www/license.php b/src/usr/local/www/license.php
index 8a25e9d..da79e4a 100644
--- a/src/usr/local/www/license.php
+++ b/src/usr/local/www/license.php
@@ -64,7 +64,7 @@ require("guiconfig.inc");
 include("head.inc");
 ?>
 <div class="panel panel-default">
-	<div class="panel-heading"><h4><?=gettext("License")?></h4></div>
+	<div class="panel-heading"><h2 class="panel-title"><?=gettext("License")?></h2></div>
 	<div class="panel-body">
 		<p>
 			<strong><?=$g['product_name']?><?=gettext(" is Copyright")?> &copy; <?=$g['product_copyright_years']?><?=gettext(" by ")?><?=$g['product_copyright']?><br />
diff --git a/src/usr/local/www/pkg_mgr.php b/src/usr/local/www/pkg_mgr.php
index 61569a0..2be162a 100644
--- a/src/usr/local/www/pkg_mgr.php
+++ b/src/usr/local/www/pkg_mgr.php
@@ -169,12 +169,15 @@ $tab_array[] = array(gettext("Installed Packages"), false, "pkg_mgr_installed.ph
 display_top_tabs($tab_array);
 ?>
 <div class="panel panel-default" id="search-panel" style="display: none;">
-	<div class="panel-heading"><?=gettext('Search')?>
-		<span class="widget-heading-icon pull-right">
-			<a data-toggle="collapse" href="#search-panel_panel-body">
-				<i class="fa fa-plus-circle"></i>
-			</a>
-		</span>
+	<div class="panel-heading">
+		<h2 class="panel-title">
+			<?=gettext('Search')?>
+			<span class="widget-heading-icon pull-right">
+				<a data-toggle="collapse" href="#search-panel_panel-body">
+					<i class="fa fa-plus-circle"></i>
+				</a>
+			</span>
+		</h2>
 	</div>
 	<div id="search-panel_panel-body" class="panel-body collapse in">
 		<div class="form-group">
diff --git a/src/usr/local/www/pkg_mgr_install.php b/src/usr/local/www/pkg_mgr_install.php
index 4bd71f2..41819ba 100644
--- a/src/usr/local/www/pkg_mgr_install.php
+++ b/src/usr/local/www/pkg_mgr_install.php
@@ -296,6 +296,7 @@ if ($input_errors) {
 	<br />
 	<div class="panel panel-default">
 		<div class="panel-heading">
+			<h2 class="panel-title">
 <?php
 			if ($pkgmode == 'reinstallall') {
 ?>
@@ -315,6 +316,7 @@ if ($input_errors) {
 <?php
 			}
 ?>
+			</h2>
 		</div>
 		<div class="panel-body">
 		<br />
diff --git a/src/usr/local/www/status.php b/src/usr/local/www/status.php
index 06fa756..b4a8afc 100755
--- a/src/usr/local/www/status.php
+++ b/src/usr/local/www/status.php
@@ -95,7 +95,7 @@ function doCmdT($title, $command) {
 	echo "\n<a name=\"" . str_replace($rubbish, '', $title) . "\" id=\"" . str_replace($rubbish, '', $title) . "\"></a>\n";
 
 	print('<div class="panel panel-default">');
-	print('<div class="panel-heading">' . $title . '</div>');
+	print('<div class="panel-heading"><h2 class="panel-title">' . $title . '</h2></div>');
 	print('<div class="panel-body">');
 	print('<pre>');
 
@@ -163,7 +163,7 @@ function listCmds() {
 	$rubbish = array('|', '-', '/', '.', ' ');	/* fixes the <a> tag to be W3C compliant */
 
 	print('<div class="panel panel-default">');
-	print('<div class="panel-heading">' . gettext("System status on ") . $currentDate . '</div>');
+	print('<div class="panel-heading"><h2 class="panel-title">' . gettext("System Status on ") . $currentDate . '</h2></div>');
 	print('<div class="panel-body">');
 	print('    <div class="content">');
 	print("\n<p>" . gettext("This status page includes the following information") . ":\n");
@@ -191,7 +191,7 @@ global $g, $config;
 /* Set up all of the commands we want to execute. */
 
 /* System stats/info */
-defCmdT("System uptime", "/usr/bin/uptime");
+defCmdT("System Uptime", "/usr/bin/uptime");
 defCmdT("Interfaces", "/sbin/ifconfig -a");
 defCmdT("Interface Statistics", "/usr/bin/netstat -nWi");
 defCmdT("Top Process Info", "/usr/bin/top | /usr/bin/head -n5");
@@ -215,7 +215,7 @@ defCmdT("pf Info", "/sbin/pfctl -si");
 defCmdT("pf Show All", "/sbin/pfctl -sa");
 defCmdT("pf Queues", "/sbin/pfctl -s queue -v");
 defCmdT("pf OSFP", "/sbin/pfctl -s osfp");
-defCmdT("pfsync stats", "/usr/bin/netstat -s -ppfsync");
+defCmdT("pfsync Stats", "/usr/bin/netstat -s -ppfsync");
 defCmdT("pftop Default", "/usr/local/sbin/pftop -a -b");
 defCmdT("pftop Long", "/usr/local/sbin/pftop -w 150 -a -b -v long");
 defCmdT("pftop Queue", "/usr/local/sbin/pftop -w 150 -a -b -v queue");
@@ -225,7 +225,7 @@ defCmdT("pftop Speed", "/usr/local/sbin/pftop -w 150 -a -b -v speed");
 if (isset($config['captiveportal']) && is_array($config['captiveportal'])) {
 	foreach ($config['captiveportal'] as $cpZone => $cpdata) {
 		if (isset($cpdata['enable'])) {
-			defCmdT("IPFW rules for {$cpdata['zone']}", "/sbin/ipfw -x " . escapeshellarg($cpdata['zoneid']) . " show");
+			defCmdT("IPFW Rules for {$cpdata['zone']}", "/sbin/ipfw -x " . escapeshellarg($cpdata['zoneid']) . " show");
 		}
 	}
 }
@@ -237,8 +237,8 @@ defCmdT("config.xml", "dumpconfigxml");
 defCmdT("resolv.conf", "/bin/cat /etc/resolv.conf");
 defCmdT("DHCP Configuration", "/bin/cat /var/dhcpd/etc/dhcpd.conf");
 defCmdT("DHCPv6 Configuration", "/bin/cat /var/dhcpd/etc/dhcpdv6.conf");
-defCmdT("strongSwan config", "/bin/cat /var/etc/ipsec/strongswan.conf");
-defCmdT("IPsec config", "/bin/cat /var/etc/ipsec/ipsec.conf");
+defCmdT("strongSwan Configuration", "/bin/cat /var/etc/ipsec/strongswan.conf");
+defCmdT("IPsec Configuration", "/bin/cat /var/etc/ipsec/ipsec.conf");
 defCmdT("IPsec Status", "/usr/local/sbin/ipsec statusall");
 defCmdT("SPD", "/sbin/setkey -DP");
 defCmdT("SAD", "/sbin/setkey -D");
@@ -252,7 +252,7 @@ if (file_exists("/boot/loader.conf.local")) {
 	defCmdT("Loader Configuration (Local)", "/bin/cat /boot/loader.conf.local");
 }
 if (file_exists("/var/etc/filterdns.conf")) {
-	defCmdT("Filter DNS Daemon Config", "/bin/cat /var/etc/filterdns.conf");
+	defCmdT("Filter DNS Daemon Configuration", "/bin/cat /var/etc/filterdns.conf");
 }
 defCmdT("last 1000 system log entries", "/usr/local/sbin/clog /var/log/system.log 2>&1 | tail -n 1000");
 defCmdT("last 1000 DHCP log entries", "/usr/local/sbin/clog /var/log/dhcpd.log 2>&1 | tail -n 1000");
@@ -280,7 +280,7 @@ defCmdT("Installed OS Packages", "/usr/sbin/pkg info");
 exec("/bin/date", $dateOutput, $dateStatus);
 $currentDate = $dateOutput[0];
 
-$pgtitle = array("{$g['product_name']}", "status");
+$pgtitle = array("{$g['product_name']}", "Status");
 include("head.inc");
 
 print_info_box(gettext("Make sure all sensitive information is removed! (Passwords, etc.) before posting " .
diff --git a/src/usr/local/www/status_ipsec.php b/src/usr/local/www/status_ipsec.php
index 5ef2c45..9b253e5 100644
--- a/src/usr/local/www/status_ipsec.php
+++ b/src/usr/local/www/status_ipsec.php
@@ -124,7 +124,7 @@ display_top_tabs($tab_array);
 ?>
 
 <div class="panel panel-default">
-	<div class="panel-heading">IPsec status</div>
+	<div class="panel-heading"><h2 class="panel-title">IPsec status</h2></div>
 	<div class="panel-body table responsive">
 		<table class="table table-striped table-condensed table-hover sortable-theme-bootstrap" data-sortable>
 			<thead>