summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2009-08-20 15:33:03 -0400
committerScott Ullrich <sullrich@pfsense.org>2009-08-20 15:33:03 -0400
commitff9d67280987862f5ab5c25d2de51f972240f34d (patch)
treec29338083a6b846923678c34f9d78bf9df4868b3 /usr
parent0f78d3ad6a5713a94dc54493f0946644e17c8058 (diff)
downloadpfsense-ff9d67280987862f5ab5c25d2de51f972240f34d.zip
pfsense-ff9d67280987862f5ab5c25d2de51f972240f34d.tar.gz
Modify sortable.js to work on tabcont as opposed to sortable class. This has the effect of making any table that has a single header sortable instead of having to visit each page. Sponsored-by: BSD Perimeter Commercial Support
Diffstat (limited to 'usr')
-rwxr-xr-xusr/local/www/diag_arp.php3
-rwxr-xr-xusr/local/www/diag_dhcp_leases.php2
-rwxr-xr-xusr/local/www/diag_dump_states.php2
-rw-r--r--usr/local/www/diag_ipsec.php3
-rwxr-xr-xusr/local/www/fbegin.inc3
-rw-r--r--usr/local/www/firewall_schedule.php2
-rw-r--r--usr/local/www/javascript/sorttable.js2
-rwxr-xr-xusr/local/www/status_captiveportal.php2
-rwxr-xr-xusr/local/www/status_slbd_pool.php5
9 files changed, 13 insertions, 11 deletions
diff --git a/usr/local/www/diag_arp.php b/usr/local/www/diag_arp.php
index 00f9b60..2588bae 100755
--- a/usr/local/www/diag_arp.php
+++ b/usr/local/www/diag_arp.php
@@ -240,12 +240,11 @@ $pgtitle = array("Diagnostics","ARP Table");
include("head.inc");
?>
<body link="#000000" vlink="#000000" alink="#000000">
-<script src="/javascript/sorttable.js"></script>
<? include("fbegin.inc"); ?>
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
<td>
-<table class="sortable" name="sortabletable" id="sortabletable" width="100%" border="0" cellpadding="0" cellspacing="0">
+<table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
<td class="listhdrr">IP address</td>
<td class="listhdrr">MAC address</td>
diff --git a/usr/local/www/diag_dhcp_leases.php b/usr/local/www/diag_dhcp_leases.php
index bdf02c9..71af0e0 100755
--- a/usr/local/www/diag_dhcp_leases.php
+++ b/usr/local/www/diag_dhcp_leases.php
@@ -278,7 +278,7 @@ if ($_GET['order'])
/* only print pool status when we have one */
if(count($pools) > 0) {
?>
-<table class="sortable" id="sortabletable" name="sortabletable" width="100%" border="0" cellpadding="0" cellspacing="0">
+<table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
<td class="listhdrr">Failover Group</a></td>
<td class="listhdrr">My State</a></td>
diff --git a/usr/local/www/diag_dump_states.php b/usr/local/www/diag_dump_states.php
index fce3d19..aa8fef0 100755
--- a/usr/local/www/diag_dump_states.php
+++ b/usr/local/www/diag_dump_states.php
@@ -141,7 +141,7 @@ include("head.inc");
</tr>
<tr>
<td>
- <table class="tabcont sortable" width="100%" border="0" cellspacing="0" cellpadding="0">
+ <table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0">
<tr>
<td class="listhdrr" width="10%"><?=gettext("Proto");?></td>
<td class="listhdrr" width="65"><?=gettext("Source -> Router -> Destination");?></td>
diff --git a/usr/local/www/diag_ipsec.php b/usr/local/www/diag_ipsec.php
index 31342c3..8001b1e 100644
--- a/usr/local/www/diag_ipsec.php
+++ b/usr/local/www/diag_ipsec.php
@@ -57,7 +57,6 @@ $sad = ipsec_dump_sad();
?>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC" onload="<?= $jsevents["body"]["onload"] ?>">
-<script src="/javascript/sorttable.js"></script>
<?php include("fbegin.inc"); ?>
<div id="inputerrors"></div>
<table width="100%" border="0" cellpadding="0" cellspacing="0">
@@ -75,7 +74,7 @@ $sad = ipsec_dump_sad();
<tr>
<td>
<div id="mainarea">
- <table class="tabcont" width="100%" border="0" cellpadding="6" cellspacing="0" class="sortable" name="sortabletable" id="sortabletable">
+ <table width="100%" border="0" cellpadding="6" cellspacing="0" class="tabcont">
<tr>
<td nowrap class="listhdrr">Local IP</td>
<td nowrap class="listhdrr">Remote IP</a></td>
diff --git a/usr/local/www/fbegin.inc b/usr/local/www/fbegin.inc
index 05a0e48..2ae3159 100755
--- a/usr/local/www/fbegin.inc
+++ b/usr/local/www/fbegin.inc
@@ -1,3 +1,6 @@
+
+<script src="/javascript/sorttable.js"></script>
+
<?php
require_once("globals.inc");
diff --git a/usr/local/www/firewall_schedule.php b/usr/local/www/firewall_schedule.php
index 888a2b1..46bef20 100644
--- a/usr/local/www/firewall_schedule.php
+++ b/usr/local/www/firewall_schedule.php
@@ -88,7 +88,7 @@ include("head.inc");
<?php include("fbegin.inc"); ?>
<?php if ($savemsg) print_info_box($savemsg); ?>
<form action="firewall_schedule.php" method="post">
- <table class="sortable" width="100%" border="0" cellpadding="0" cellspacing="0">
+ <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
<td width="25%" class="listhdrr">Name</td>
<td width="35%" class="listhdrr">Time Range(s)</td>
diff --git a/usr/local/www/javascript/sorttable.js b/usr/local/www/javascript/sorttable.js
index 25bccb2..8980741 100644
--- a/usr/local/www/javascript/sorttable.js
+++ b/usr/local/www/javascript/sorttable.js
@@ -32,7 +32,7 @@ sorttable = {
sorttable.DATE_RE = /^(\d\d?)[\/\.-](\d\d?)[\/\.-]((\d\d)?\d\d)$/;
forEach(document.getElementsByTagName('table'), function(table) {
- if (table.className.search(/\bsortable\b/) != -1) {
+ if (table.className.search(/\btabcont\b/) != -1) {
sorttable.makeSortable(table);
}
});
diff --git a/usr/local/www/status_captiveportal.php b/usr/local/www/status_captiveportal.php
index f29e749..ab0e20d 100755
--- a/usr/local/www/status_captiveportal.php
+++ b/usr/local/www/status_captiveportal.php
@@ -106,7 +106,7 @@ if ($_GET['order']) {
<td class="tabcont">
<? endif; ?>
-<table class="sortable" width="100%" border="0" cellpadding="0" cellspacing="0">
+<table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
<tr>
<td class="listhdrr"><a href="?order=ip&amp;showact=<?=$_GET['showact'];?>"><?=gettext("IP address");?></a></td>
<td class="listhdrr"><a href="?order=mac&amp;showact=<?=$_GET['showact'];?>"><?=gettext("MAC address");?></a></td>
diff --git a/usr/local/www/status_slbd_pool.php b/usr/local/www/status_slbd_pool.php
index fb9d615..5754d07 100755
--- a/usr/local/www/status_slbd_pool.php
+++ b/usr/local/www/status_slbd_pool.php
@@ -57,6 +57,7 @@ include("head.inc");
?>
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
+<script src="/javascript/sorttable.js"></script>
<?php include("fbegin.inc"); ?>
<table width="100%" border="0" cellpadding="0" cellspacing="0">
<tr><td class="tabnavtbl">
@@ -71,10 +72,10 @@ include("head.inc");
<tr>
<td>
<div id="mainarea">
- <table class="tabcont" width="100%" border="0" cellpadding="0" cellspacing="0">
+ <table width="100%" border="0" cellpadding="0" cellspacing="0" class="tabcont" name="sortabletable" id="sortabletable">
<tr>
<td width="10%" class="listhdrr">Name</td>
- <td width="10%" class="listhdrr">Type</td>
+ <td width="10%" class="listhdrr">Type</td>
<td width="10%" class="listhdrr">Gateways</td>
<td width="30%" class="listhdrr">Status</td>
<td width="30%" class="listhdr">Description</td>
OpenPOWER on IntegriCloud