summaryrefslogtreecommitdiffstats
path: root/usr/local/www
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2005-07-02 04:21:21 +0000
committerScott Ullrich <sullrich@pfsense.org>2005-07-02 04:21:21 +0000
commitb63695dbae043a6718a7103f13342d8440c53ed3 (patch)
treeb7ccfa8b03902127a31ee726ba2a7a68d2fff7a0 /usr/local/www
parent7f43ca88afa8e6ba3fe1596a870daa0b08c86f3f (diff)
downloadpfsense-b63695dbae043a6718a7103f13342d8440c53ed3.zip
pfsense-b63695dbae043a6718a7103f13342d8440c53ed3.tar.gz
include head.inc and round corners on tabs
Diffstat (limited to 'usr/local/www')
-rwxr-xr-xusr/local/www/carp_status.php12
-rwxr-xr-xusr/local/www/diag_backup.php10
-rwxr-xr-xusr/local/www/diag_confbak.php10
-rwxr-xr-xusr/local/www/diag_defaults.php11
-rwxr-xr-xusr/local/www/diag_dhcp_leases.php11
-rwxr-xr-xusr/local/www/diag_ipsec_sad.php21
-rwxr-xr-xusr/local/www/diag_ipsec_spd.php21
-rwxr-xr-xusr/local/www/diag_logs.php29
-rwxr-xr-xusr/local/www/diag_logs_auth.php29
-rwxr-xr-xusr/local/www/diag_logs_dhcp.php29
-rwxr-xr-xusr/local/www/diag_logs_filter.php32
-rwxr-xr-xusr/local/www/diag_logs_ipsec.php30
-rwxr-xr-xusr/local/www/diag_logs_settings.php31
-rwxr-xr-xusr/local/www/diag_logs_vpn.php29
-rwxr-xr-xusr/local/www/diag_ping.php11
-rwxr-xr-xusr/local/www/diag_pkglogs.php12
-rwxr-xr-xusr/local/www/diag_resetstate.php12
-rwxr-xr-xusr/local/www/firewall_aliases.php11
-rwxr-xr-xusr/local/www/services_dnsmasq.php9
-rwxr-xr-xusr/local/www/services_dnsmasq_domainoverride_edit.php11
-rwxr-xr-xusr/local/www/services_dnsmasq_edit.php11
-rwxr-xr-xusr/local/www/system_advanced.php13
22 files changed, 163 insertions, 232 deletions
diff --git a/usr/local/www/carp_status.php b/usr/local/www/carp_status.php
index 629a0cd..8355e25 100755
--- a/usr/local/www/carp_status.php
+++ b/usr/local/www/carp_status.php
@@ -54,15 +54,11 @@ if($_POST['disablecarp'] <> "") {
}
$status = get_carp_status();
+
+$pgtitle = "CARP: Status";
+include("head.inc");
+
?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<?php $title = "CARP: Status"; ?>
-<title><?=gentitle_pkg($title);?></title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link href="gui.css" rel="stylesheet" type="text/css">
-</head>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php
diff --git a/usr/local/www/diag_backup.php b/usr/local/www/diag_backup.php
index 2ca43c6..6c44507 100755
--- a/usr/local/www/diag_backup.php
+++ b/usr/local/www/diag_backup.php
@@ -176,14 +176,10 @@ $id = rand() . '.' . time();
$mth = ini_get('upload_progress_meter.store_method');
$dir = ini_get('upload_progress_meter.file.filename_template');
+$pgtitle = "Diagnostics: Backup/restore";
+include("head.inc");
+
?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title><?=gentitle("Diagnostics: Backup/restore");?></title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link href="gui.css" rel="stylesheet" type="text/css">
-</head>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
diff --git a/usr/local/www/diag_confbak.php b/usr/local/www/diag_confbak.php
index 37b3a63..e56f2fd 100755
--- a/usr/local/www/diag_confbak.php
+++ b/usr/local/www/diag_confbak.php
@@ -49,15 +49,11 @@ cleanup_backupcache();
$confvers = get_backups();
unset($confvers['versions']);
+$pgtitle = "";
+include("head.inc");
+
?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title><?=gentitle("Diagnostics: Configuration History");?></title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link href="gui.css" rel="stylesheet" type="text/css">
-</head>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
<p class="pgtitle">Diagnostics: Configuration History</p>
diff --git a/usr/local/www/diag_defaults.php b/usr/local/www/diag_defaults.php
index cf90b9a..b02df12 100755
--- a/usr/local/www/diag_defaults.php
+++ b/usr/local/www/diag_defaults.php
@@ -44,14 +44,11 @@ if ($_POST) {
exit;
}
}
+
+$pgtitle = "Diagnostics: Factory defaults";
+include("head.inc");
+
?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title><?=gentitle("Diagnostics: Factory defaults");?></title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link href="gui.css" rel="stylesheet" type="text/css">
-</head>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
diff --git a/usr/local/www/diag_dhcp_leases.php b/usr/local/www/diag_dhcp_leases.php
index d2256c7..678a28e 100755
--- a/usr/local/www/diag_dhcp_leases.php
+++ b/usr/local/www/diag_dhcp_leases.php
@@ -33,14 +33,11 @@
*/
require("guiconfig.inc");
+
+$pgtitle = "Diagnostics: DHCP leases";
+include("head.inc");
+
?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title><?=gentitle("Diagnostics: DHCP leases");?></title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link href="gui.css" rel="stylesheet" type="text/css">
-</head>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
diff --git a/usr/local/www/diag_ipsec_sad.php b/usr/local/www/diag_ipsec_sad.php
index e7530a4..872242c 100755
--- a/usr/local/www/diag_ipsec_sad.php
+++ b/usr/local/www/diag_ipsec_sad.php
@@ -33,24 +33,23 @@
*/
require("guiconfig.inc");
+
+$pgtitle = "Diagnostics: IPSEC: SA";
+include("head.inc");
+
?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title><?=gentitle("Diagnostics: IPsec");?></title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link href="gui.css" rel="stylesheet" type="text/css">
-</head>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
<p class="pgtitle">Diagnostics: IPsec</p>
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr><td>
- <ul id="tabnav">
- <li class="tabact">SAD</li>
- <li class="tabinact"><a href="diag_ipsec_spd.php">SPD</a></li>
- </ul>
+<?php
+ $tab_array = array();
+ $tab_array[0] = array("SAD", true, "diag_ipsec_sad.php");
+ $tab_array[1] = array("SPD", false, "diag_ipsec_spd.php");
+ display_top_tabs($tab_array);
+?>
</td></tr>
<tr>
<td class="tabcont">
diff --git a/usr/local/www/diag_ipsec_spd.php b/usr/local/www/diag_ipsec_spd.php
index 452bd02..c346ac3 100755
--- a/usr/local/www/diag_ipsec_spd.php
+++ b/usr/local/www/diag_ipsec_spd.php
@@ -33,24 +33,23 @@
*/
require("guiconfig.inc");
+
+$pgtitle = "Diagnostics: IPSEC: SPD";
+include("head.inc");
+
?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title><?=gentitle("Diagnostics: IPsec");?></title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link href="gui.css" rel="stylesheet" type="text/css">
-</head>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
<p class="pgtitle">Diagnostics: IPsec</p>
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr><td>
- <ul id="tabnav">
- <li class="tabinact"><a href="diag_ipsec_sad.php">SAD</a></li>
- <li class="tabact">SPD</li>
- </ul>
+<?php
+ $tab_array = array();
+ $tab_array[0] = array("SAD", false, "diag_ipsec_sad.php");
+ $tab_array[1] = array("SPD", true, "diag_ipsec_spd.php");
+ display_top_tabs($tab_array);
+?>
</td></tr>
<tr>
<td class="tabcont">
diff --git a/usr/local/www/diag_logs.php b/usr/local/www/diag_logs.php
index 1ca2b6e..53db780 100755
--- a/usr/local/www/diag_logs.php
+++ b/usr/local/www/diag_logs.php
@@ -44,29 +44,26 @@ if ($_POST['clear']) {
exec("/usr/sbin/clog -i -s 262144 {$system_logfile}");
}
+$pgtitle = "Diagnostics: System logs: System";
+include("head.inc");
+
?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title><?=gentitle("Diagnostics: System logs: System");?></title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link href="gui.css" rel="stylesheet" type="text/css">
-</head>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
<p class="pgtitle">Diagnostics: System logs: System</p>
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr><td>
- <ul id="tabnav">
- <li class="tabact">System</li>
- <li class="tabinact"><a href="diag_logs_filter.php">Firewall</a></li>
- <li class="tabinact"><a href="diag_logs_dhcp.php">DHCP</a></li>
- <li class="tabinact"><a href="diag_logs_auth.php">Portal Auth</a></li>
- <li class="tabinact"><a href="diag_logs_ipsec.php">IPSEC VPN</a></li>
- <li class="tabinact"><a href="diag_logs_vpn.php">PPTP VPN</a></li>
- <li class="tabinact"><a href="diag_logs_settings.php">Settings</a></li>
- </ul>
+<?php
+ $tab_array = array();
+ $tab_array[0] = array("Firewall", true, "diag_logs_filter.php");
+ $tab_array[1] = array("DHCP", false, "firewall_nat_server.php");
+ $tab_array[2] = array("Portal Auth", false, "diag_logs_auth.php");
+ $tab_array[3] = array("IPSEC VPN", false, "diag_logs_ipsec.php");
+ $tab_array[4] = array("PPTP VPN", false, "diag_logs_vpn.php");
+ $tab_array[5] = array("Settings", false, "diag_logs_settings.php");
+ display_top_tabs($tab_array);
+?>
</td></tr>
<tr>
<td class="tabcont">
diff --git a/usr/local/www/diag_logs_auth.php b/usr/local/www/diag_logs_auth.php
index 6da7626..43611a1 100755
--- a/usr/local/www/diag_logs_auth.php
+++ b/usr/local/www/diag_logs_auth.php
@@ -42,29 +42,26 @@ if ($_POST['clear']) {
exec("/usr/sbin/clog -i -s 262144 {$portal_logfile}");
}
+$pgtitle = "Diagnostics: System logs: Portal Auth";
+include("head.inc");
+
?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title><?=gentitle("Diagnostics: System logs: Portal Auth");?></title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link href="gui.css" rel="stylesheet" type="text/css">
-</head>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
<p class="pgtitle">Diagnostics: System logs: Portal Auth</p>
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr><td>
- <ul id="tabnav">
- <li class="tabinact"><a href="diag_logs.php">System</a></li>
- <li class="tabinact"><a href="diag_logs_filter.php">Firewall</a></li>
- <li class="tabinact"><a href="diag_logs_dhcp.php">DHCP</a></li>
- <li class="tabact">Portal Auth</li>
- <li class="tabinact"><a href="diag_logs_ipsec.php">IPSEC VPN</a></li>
- <li class="tabinact"><a href="diag_logs_vpn.php">PPTP VPN</a></li>
- <li class="tabinact"><a href="diag_logs_settings.php">Settings</a></li>
- </ul>
+<?php
+ $tab_array = array();
+ $tab_array[0] = array("Firewall", false, "diag_logs_filter.php");
+ $tab_array[1] = array("DHCP", false, "firewall_nat_server.php");
+ $tab_array[2] = array("Portal Auth", true, "diag_logs_auth.php");
+ $tab_array[3] = array("IPSEC VPN", false, "diag_logs_ipsec.php");
+ $tab_array[4] = array("PPTP VPN", false, "diag_logs_vpn.php");
+ $tab_array[5] = array("Settings", false, "diag_logs_settings.php");
+ display_top_tabs($tab_array);
+?>
</td></tr>
<tr>
<td class="tabcont">
diff --git a/usr/local/www/diag_logs_dhcp.php b/usr/local/www/diag_logs_dhcp.php
index d450071..f54d0be 100755
--- a/usr/local/www/diag_logs_dhcp.php
+++ b/usr/local/www/diag_logs_dhcp.php
@@ -44,29 +44,26 @@ if ($_POST['clear']) {
exec("/usr/sbin/clog -i -s 262144 {$dhcpd_logfile}");
}
+$pgtitle = "Diagnostics: System logs: DHCP";
+include("head.inc");
+
?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title><?=gentitle("Diagnostics: System logs: DHCP");?></title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link href="gui.css" rel="stylesheet" type="text/css">
-</head>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
<p class="pgtitle">Diagnostics: System logs: DHCP</p>
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr><td>
- <ul id="tabnav">
- <li class="tabinact"><a href="diag_logs.php">System</a></li>
- <li class="tabinact"><a href="diag_logs_filter.php">Firewall</a></li>
- <li class="tabact">DHCP</li>
- <li class="tabinact"><a href="diag_logs_auth.php">Portal Auth</a></li>
- <li class="tabinact"><a href="diag_logs_ipsec.php">IPSEC VPN</a></li>
- <li class="tabinact"><a href="diag_logs_vpn.php">PPTP VPN</a></li>
- <li class="tabinact"><a href="diag_logs_settings.php">Settings</a></li>
- </ul>
+<?php
+ $tab_array = array();
+ $tab_array[0] = array("Firewall", false, "diag_logs_filter.php");
+ $tab_array[1] = array("DHCP", true, "firewall_nat_server.php");
+ $tab_array[2] = array("Portal Auth", false, "diag_logs_auth.php");
+ $tab_array[3] = array("IPSEC VPN", false, "diag_logs_ipsec.php");
+ $tab_array[4] = array("PPTP VPN", false, "diag_logs_vpn.php");
+ $tab_array[5] = array("Settings", false, "diag_logs_settings.php");
+ display_top_tabs($tab_array);
+?>
</td></tr>
<tr>
<td class="tabcont">
diff --git a/usr/local/www/diag_logs_filter.php b/usr/local/www/diag_logs_filter.php
index 2ddc558..86aff06 100755
--- a/usr/local/www/diag_logs_filter.php
+++ b/usr/local/www/diag_logs_filter.php
@@ -113,30 +113,26 @@ function format_ipf_ip($ipfip) {
return $ip . ", port " . $port;
}
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title><?=gentitle("Diagnostics: System logs: Firewall");?></title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link href="gui.css" rel="stylesheet" type="text/css">
-</head>
+$pgtitle = "Diagnostics: System logs: Firewall";
+include("head.inc");
+?>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
<p class="pgtitle">Diagnostics: System logs: Firewall</p>
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr><td>
- <ul id="tabnav">
- <li class="tabinact"><a href="diag_logs.php">System</a></li>
- <li class="tabact">Firewall</li>
- <li class="tabinact"><a href="diag_logs_dhcp.php">DHCP</a></li>
- <li class="tabinact"><a href="diag_logs_auth.php">Portal Auth</a></li>
- <li class="tabinact"><a href="diag_logs_ipsec.php">IPSEC VPN</a></li>
- <li class="tabinact"><a href="diag_logs_vpn.php">PPTP VPN</a></li>
- <li class="tabinact"><a href="diag_logs_settings.php">Settings</a></li>
- </ul>
- </td></tr>
+<?php
+ $tab_array = array();
+ $tab_array[0] = array("Firewall", true, "diag_logs_filter.php");
+ $tab_array[1] = array("DHCP", false, "firewall_nat_server.php");
+ $tab_array[2] = array("Portal Auth", false, "diag_logs_auth.php");
+ $tab_array[3] = array("IPSEC VPN", false, "diag_logs_ipsec.php");
+ $tab_array[4] = array("PPTP VPN", false, "diag_logs_vpn.php");
+ $tab_array[5] = array("Settings", false, "diag_logs_settings.php");
+ display_top_tabs($tab_array);
+?>
+ </td></tr>
<tr>
<td class="tabcont">
<?php if (!isset($config['syslog']['rawfilter'])):
diff --git a/usr/local/www/diag_logs_ipsec.php b/usr/local/www/diag_logs_ipsec.php
index 1fb8ecd..d4414ea 100755
--- a/usr/local/www/diag_logs_ipsec.php
+++ b/usr/local/www/diag_logs_ipsec.php
@@ -44,29 +44,25 @@ if ($_POST['clear']) {
exec("/usr/sbin/clog -i -s 262144 {$ipsec_logfile}");
}
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title><?=gentitle("Diagnostics: System logs: IPSEC VPN");?></title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link href="gui.css" rel="stylesheet" type="text/css">
-</head>
+$pgtitle = "Diagnostics: System logs: IPSEC VPN";
+include("head.inc");
+?>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
<p class="pgtitle">Diagnostics: System logs: IPSEC VPN</p>
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr><td>
- <ul id="tabnav">
- <li class="tabinact"><a href="diag_logs.php">System</a></li>
- <li class="tabinact"><a href="diag_logs_filter.php">Firewall</a></li>
- <li class="tabinact"><a href="diag_logs_dhcp.php">DHCP</a></li>
- <li class="tabinact"><a href="diag_logs_auth.php">Portal Auth</a></li>
- <li class="tabact">IPSEC VPN</li>
- <li class="tabinact"><a href="diag_logs_vpn.php">PPTP VPN</a></li>
- <li class="tabinact"><a href="diag_logs_settings.php">Settings</a></li>
- </ul>
+<?php
+ $tab_array = array();
+ $tab_array[0] = array("Firewall", false, "diag_logs_filter.php");
+ $tab_array[1] = array("DHCP", false, "firewall_nat_server.php");
+ $tab_array[2] = array("Portal Auth", false, "diag_logs_auth.php");
+ $tab_array[3] = array("IPSEC VPN", true, "diag_logs_ipsec.php");
+ $tab_array[4] = array("PPTP VPN", false, "diag_logs_vpn.php");
+ $tab_array[5] = array("Settings", false, "diag_logs_settings.php");
+ display_top_tabs($tab_array);
+?>
</td></tr>
<tr>
<td class="tabcont">
diff --git a/usr/local/www/diag_logs_settings.php b/usr/local/www/diag_logs_settings.php
index 2896a31..9f28f52 100755
--- a/usr/local/www/diag_logs_settings.php
+++ b/usr/local/www/diag_logs_settings.php
@@ -90,13 +90,12 @@ if ($_POST) {
}
}
+$pgtitle = "Diagnostics: System logs: Settings";
+include("head.inc");
+
?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title><?=gentitle("Diagnostics: System logs: Settings");?></title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link href="gui.css" rel="stylesheet" type="text/css">
+
+
<script language="JavaScript">
<!--
function enable_change(enable_over) {
@@ -118,7 +117,6 @@ function enable_change(enable_over) {
}
// -->
</script>
-</head>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
@@ -128,15 +126,16 @@ function enable_change(enable_over) {
<?php if ($savemsg) print_info_box($savemsg); ?>
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr><td>
- <ul id="tabnav">
- <li class="tabinact"><a href="diag_logs.php">System</a></li>
- <li class="tabinact"><a href="diag_logs_filter.php">Firewall</a></li>
- <li class="tabinact"><a href="diag_logs_dhcp.php">DHCP</a></li>
- <li class="tabinact"><a href="diag_logs_auth.php">Portal Auth</a></li>
- <li class="tabinact"><a href="diag_logs_ipsec.php">IPSEC VPN</a></li>
- <li class="tabinact"><a href="diag_logs_vpn.php">PPTP VPN</a></li>
- <li class="tabact">Settings</li>
- </ul>
+<?php
+ $tab_array = array();
+ $tab_array[0] = array("Firewall", false, "diag_logs_filter.php");
+ $tab_array[1] = array("DHCP", false, "firewall_nat_server.php");
+ $tab_array[2] = array("Portal Auth", false, "diag_logs_auth.php");
+ $tab_array[3] = array("IPSEC VPN", false, "diag_logs_ipsec.php");
+ $tab_array[4] = array("PPTP VPN", false, "diag_logs_vpn.php");
+ $tab_array[5] = array("Settings", true, "diag_logs_settings.php");
+ display_top_tabs($tab_array);
+?>
</td></tr>
<tr>
<td class="tabcont">
diff --git a/usr/local/www/diag_logs_vpn.php b/usr/local/www/diag_logs_vpn.php
index a35c068..6e9ca1f 100755
--- a/usr/local/www/diag_logs_vpn.php
+++ b/usr/local/www/diag_logs_vpn.php
@@ -69,29 +69,26 @@ function dump_clog_vpn($logfile, $tail) {
}
}
+$pgtitle = "Diagnostics: System logs: PPTP VPN";
+include("head.inc");
+
?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title><?=gentitle("Diagnostics: System logs: PPTP VPN");?></title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link href="gui.css" rel="stylesheet" type="text/css">
-</head>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
<p class="pgtitle">Diagnostics: System logs: PPTP VPN</p>
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr><td>
- <ul id="tabnav">
- <li class="tabinact"><a href="diag_logs.php">System</a></li>
- <li class="tabinact"><a href="diag_logs_filter.php">Firewall</a></li>
- <li class="tabinact"><a href="diag_logs_dhcp.php">DHCP</a></li>
- <li class="tabinact"><a href="diag_logs_auth.php">Portal Auth</a></li>
- <li class="tabinact"><a href="diag_logs_ipsec.php">IPSEC VPN</a></li>
- <li class="tabact">PPTP VPN</li>
- <li class="tabinact"><a href="diag_logs_settings.php">Settings</a></li>
- </ul>
+<?php
+ $tab_array = array();
+ $tab_array[0] = array("Firewall", false, "diag_logs_filter.php");
+ $tab_array[1] = array("DHCP", false, "firewall_nat_server.php");
+ $tab_array[2] = array("Portal Auth", false, "diag_logs_auth.php");
+ $tab_array[3] = array("IPSEC VPN", false, "diag_logs_ipsec.php");
+ $tab_array[4] = array("PPTP VPN", true, "diag_logs_vpn.php");
+ $tab_array[5] = array("Settings", false, "diag_logs_settings.php");
+ display_top_tabs($tab_array);
+?>
</td></tr>
<tr>
<td class="tabcont">
diff --git a/usr/local/www/diag_ping.php b/usr/local/www/diag_ping.php
index df449b0..b3b9313 100755
--- a/usr/local/www/diag_ping.php
+++ b/usr/local/www/diag_ping.php
@@ -62,14 +62,11 @@ if (!isset($do_ping)) {
$host = '';
$count = DEFAULT_COUNT;
}
+
+$pgtitle = "Diagnostics: Ping";
+include("head.inc");
+
?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title><?=gentitle("Diagnostics: Ping");?></title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link href="gui.css" rel="stylesheet" type="text/css">
-</head>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
diff --git a/usr/local/www/diag_pkglogs.php b/usr/local/www/diag_pkglogs.php
index 732c8d8..bcb4be5 100755
--- a/usr/local/www/diag_pkglogs.php
+++ b/usr/local/www/diag_pkglogs.php
@@ -66,15 +66,11 @@ if(!$apkg) { // If we aren't looking for a specific package, locate the first pa
$apkgid = get_pkg_id($apkg);
$i = $apkgid;
}
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title><?=gentitle("Diagnostics: Package logs");?></title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link href="gui.css" rel="stylesheet" type="text/css">
-</head>
+$pgtitle = "Diagnostics: Package logs";
+include("head.inc");
+
+?>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
<p class="pgtitle">Diagnostics: Package logs</p>
diff --git a/usr/local/www/diag_resetstate.php b/usr/local/www/diag_resetstate.php
index 1849f57..962b514 100755
--- a/usr/local/www/diag_resetstate.php
+++ b/usr/local/www/diag_resetstate.php
@@ -48,15 +48,11 @@ if ($_POST) {
$savemsg .= "The state table has been flushed successfully.";
}
}
-?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title><?=gentitle("Diagnostics: Reset state");?></title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link href="gui.css" rel="stylesheet" type="text/css">
-</head>
+$pgtitle = "Diagnostics: Reset state";
+include("head.inc");
+
+?>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
<p class="pgtitle">Diagnostics: Reset state</p>
diff --git a/usr/local/www/firewall_aliases.php b/usr/local/www/firewall_aliases.php
index a946394..580d440 100755
--- a/usr/local/www/firewall_aliases.php
+++ b/usr/local/www/firewall_aliases.php
@@ -72,14 +72,11 @@ if ($_GET['act'] == "del") {
exit;
}
}
+
+$pgtitle = "Firewall: Aliases";
+include("head.inc");
+
?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title><?=gentitle("Firewall: Aliases");?></title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link href="gui.css" rel="stylesheet" type="text/css">
-</head>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
diff --git a/usr/local/www/services_dnsmasq.php b/usr/local/www/services_dnsmasq.php
index 188bcc0..95c384f 100755
--- a/usr/local/www/services_dnsmasq.php
+++ b/usr/local/www/services_dnsmasq.php
@@ -90,15 +90,10 @@ if ($_GET['act'] == "del") {
}
}
+$pgtitle = "Services: DNS forwarder";
+include("head.inc");
?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title><?=gentitle("Services: DNS forwarder");?></title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link href="gui.css" rel="stylesheet" type="text/css">
-</head>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
diff --git a/usr/local/www/services_dnsmasq_domainoverride_edit.php b/usr/local/www/services_dnsmasq_domainoverride_edit.php
index 4079572..8052fd3 100755
--- a/usr/local/www/services_dnsmasq_domainoverride_edit.php
+++ b/usr/local/www/services_dnsmasq_domainoverride_edit.php
@@ -95,14 +95,11 @@ if ($_POST) {
exit;
}
}
+
+$pgtitle = "Services: DNS forwarder";
+include("head.inc");
+
?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title><?=gentitle("Services: DNS forwarder");?></title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link href="gui.css" rel="stylesheet" type="text/css">
-</head>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
diff --git a/usr/local/www/services_dnsmasq_edit.php b/usr/local/www/services_dnsmasq_edit.php
index a667730..fa636bd 100755
--- a/usr/local/www/services_dnsmasq_edit.php
+++ b/usr/local/www/services_dnsmasq_edit.php
@@ -100,14 +100,11 @@ if ($_POST) {
exit;
}
}
+
+$pgtitle = "Services: DNS forwarder: Edit host";
+include("head.inc");
+
?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title><?=gentitle("Services: DNS forwarder: Edit host");?></title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link href="gui.css" rel="stylesheet" type="text/css">
-</head>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<?php include("fbegin.inc"); ?>
diff --git a/usr/local/www/system_advanced.php b/usr/local/www/system_advanced.php
index d3c7834..7209e04 100755
--- a/usr/local/www/system_advanced.php
+++ b/usr/local/www/system_advanced.php
@@ -200,13 +200,12 @@ if ($_POST) {
conf_mount_ro();
}
}
+
+$pgtitle = "System: Advanced functions";
+include("head.inc");
+
?>
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-<head>
-<title><?=gentitle("System: Advanced functions");?></title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-<link href="gui.css" rel="stylesheet" type="text/css">
+
<script language="JavaScript">
<!--
function enable_change(enable_over) {
@@ -231,8 +230,6 @@ function update_description(itemnum) {
// -->
</script>
-</head>
-
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
<form action="system_advanced.php" method="post" name="iform" id="iform">
<?php include("fbegin.inc"); ?>
OpenPOWER on IntegriCloud