diff options
author | Stephen Beaver <sbeaver@netgate.com> | 2015-11-10 09:16:11 -0500 |
---|---|---|
committer | Stephen Beaver <sbeaver@netgate.com> | 2015-11-10 09:17:43 -0500 |
commit | 10fe1eb50b7af073098bd72681ec49c1ccb11103 (patch) | |
tree | 358ebf1847581b43a3fb473e7085b7bd7323920e /src | |
parent | 67e58c2c7854b80f52e2092ee15684c205b6486b (diff) | |
download | pfsense-10fe1eb50b7af073098bd72681ec49c1ccb11103.zip pfsense-10fe1eb50b7af073098bd72681ec49c1ccb11103.tar.gz |
Completes #5400, #3999, #5405
Mote: New ticket will be opened to provide IP address sorting
Diffstat (limited to 'src')
28 files changed, 40 insertions, 40 deletions
diff --git a/src/usr/local/www/carp_status.php b/src/usr/local/www/carp_status.php index f1bba45..abbf305 100644 --- a/src/usr/local/www/carp_status.php +++ b/src/usr/local/www/carp_status.php @@ -214,7 +214,7 @@ if ($carpcount == 0) { <div class="panel panel-default"> <div class="panel-heading"><h2 class="panel-title"><?=gettext('CARP Interfaces')?></h2></div> <div class="panel-body table-responsive"> - <table class="table table-striped table-hover table-condensed"> + <table class="table table-striped table-condensed table-hover sortable-theme-bootstrap " data-sortable> <thead> <tr> <th><?=gettext("CARP Interface")?></th> diff --git a/src/usr/local/www/diag_dump_states.php b/src/usr/local/www/diag_dump_states.php index 4adc3c2..96d20b7 100755 --- a/src/usr/local/www/diag_dump_states.php +++ b/src/usr/local/www/diag_dump_states.php @@ -165,7 +165,7 @@ if (isset($_POST['filter']) && (is_ipaddr($_POST['filter']) || is_subnet($_POST[ $form->add($section); print $form; ?> -<table class="table table-striped"> +<table class="table table-striped table-condensed table-hover sortable-theme-bootstrap" data-sortable> <thead> <tr> <th><?=gettext("Int")?></th> diff --git a/src/usr/local/www/diag_ipsec.php b/src/usr/local/www/diag_ipsec.php index 091850d..3bad72d 100644 --- a/src/usr/local/www/diag_ipsec.php +++ b/src/usr/local/www/diag_ipsec.php @@ -131,7 +131,7 @@ display_top_tabs($tab_array); <div class="panel panel-default"> <div class="panel-heading">IPSec status</div> <div class="panel-body table responsive"> - <table class="table table-striped table-hover table-condensed"> + <table class="table table-striped table-condensed table-hover sortable-theme-bootstrap" data-sortable> <thead> <tr> <th><?=gettext("Description")?></th> diff --git a/src/usr/local/www/diag_ipsec_leases.php b/src/usr/local/www/diag_ipsec_leases.php index 189ee4f..b4533f2 100644 --- a/src/usr/local/www/diag_ipsec_leases.php +++ b/src/usr/local/www/diag_ipsec_leases.php @@ -87,7 +87,7 @@ display_top_tabs($tab_array); if (isset($mobile['pool']) && is_array($mobile['pool'])) { ?> <div class="table-responsive"> - <table class="table table-hover table-condensed"> + <table class="table table-striped table-condensed table-hover sortable-theme-bootstrap" data-sortable> <thead> <tr> <th><?=gettext("Pool")?></th> diff --git a/src/usr/local/www/diag_ipsec_spd.php b/src/usr/local/www/diag_ipsec_spd.php index c15b1a0..ab78ffc 100644 --- a/src/usr/local/www/diag_ipsec_spd.php +++ b/src/usr/local/www/diag_ipsec_spd.php @@ -91,7 +91,7 @@ display_top_tabs($tab_array); if (count($spd)) { ?> <div class="table-responsive"> - <table class="table table-striped table-hover table-condensed"> + <table class="table table-striped table-condensed table-hover sortable-theme-bootstrap" data-sortable> <thead> <tr> <th><?= gettext("Source"); ?></th> diff --git a/src/usr/local/www/diag_ndp.php b/src/usr/local/www/diag_ndp.php index 045dcb5..dd9c823 100644 --- a/src/usr/local/www/diag_ndp.php +++ b/src/usr/local/www/diag_ndp.php @@ -135,8 +135,8 @@ include("head.inc"); ?> <div class="table-responsive"> - <table class="table table-striped table-hover"> - <thead> + <table class="table table-striped table-condensed table-hover sortable-theme-bootstrap" data-sortable> + <thead> <tr> <th><?= gettext("IPv6 address"); ?></th> <th><?= gettext("MAC address"); ?></th> diff --git a/src/usr/local/www/diag_routes.php b/src/usr/local/www/diag_routes.php index b790f1e..1311f91 100644 --- a/src/usr/local/www/diag_routes.php +++ b/src/usr/local/www/diag_routes.php @@ -208,7 +208,7 @@ events.push(function(){ <div class="panel panel-default"> <div class="panel-heading"><h2 class="panel-title">IPv4 Routes</h2></div> <div class="panel panel-body"> - <table class="table table-striped table-compact" id="IPv4"> + <table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable id="IPv4"> <thead> <!-- filled by xhr --> </thead> @@ -224,7 +224,7 @@ events.push(function(){ <div class="panel panel-default"> <div class="panel-heading"><h2 class="panel-title">IPv6 Routes</h2></div> <div class="panel panel-body"> - <table class="table table-striped table-compact" id="IPv6"> + <table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable id="IPv6"> <thead> <!-- filled by xhr --> </thead> diff --git a/src/usr/local/www/diag_sockets.php b/src/usr/local/www/diag_sockets.php index 7b70a11..9b61276 100644 --- a/src/usr/local/www/diag_sockets.php +++ b/src/usr/local/www/diag_sockets.php @@ -93,10 +93,10 @@ $showAllOption = $showAll ? "" : "?showAll"; $name = ($tabindex == 0 ? 'IPv4' : 'IPv6'); ?> <div class="panel panel-default"> - <div class="panel-heading"><h2 class="panel-title"><?=$name?> system socket information</h2></div> + <div class="panel-heading"><h2 class="panel-title"><?=$name?> <?=gettext("system socket information")?></h2></div> <div class="panel-body"> <div class="table table-responsive"> - <table class="table table-hover table-striped table-condensed"> + <table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable> <thead> <?php foreach (explode("\n", $table) as $i => $line) { diff --git a/src/usr/local/www/firewall_schedule.php b/src/usr/local/www/firewall_schedule.php index 0b6965c..3f00936 100644 --- a/src/usr/local/www/firewall_schedule.php +++ b/src/usr/local/www/firewall_schedule.php @@ -138,7 +138,7 @@ foreach ($a_schedules as $schedule): ?> <tr> <td> - <?=(true) ? '<a title="' . gettext("Schedule is currently active") . '">' . CLOCK . '</a>':''?> + <?=($schedstatus) ? '<a title="' . gettext("Schedule is currently active") . '">' . CLOCK . '</a>':''?> </td> <td> <?=htmlspecialchars($schedule['name'])?> diff --git a/src/usr/local/www/services_dnsmasq.php b/src/usr/local/www/services_dnsmasq.php index 8f263b7..1d77551 100644 --- a/src/usr/local/www/services_dnsmasq.php +++ b/src/usr/local/www/services_dnsmasq.php @@ -355,7 +355,7 @@ print_info_box(sprintf("If the DNS forwarder is enabled, the DHCP". <div class="panel panel-default"> <div class="panel-heading"><h2 class="panel-title"><?=gettext("Host Overrides")?></h2></div> <div class="panel-body table-responsive"> - <table class="table table-striped table-hover table-condensed"> + <table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable> <thead> <tr> <th><?=gettext("Host")?></th> @@ -434,7 +434,7 @@ print_info_box(gettext("Entries in this section override individual results from <div class="panel panel-default"> <div class="panel-heading"><h2 class="panel-title"><?=gettext("Domain Overrides")?></h2></div> <div class="panel-body table-responsive"> - <table class="table table-striped table-hover table-condensed"> + <table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable> <thead> <tr> <th><?=gettext("Domain")?></th> diff --git a/src/usr/local/www/services_unbound.php b/src/usr/local/www/services_unbound.php index b743f14..aa426b8 100644 --- a/src/usr/local/www/services_unbound.php +++ b/src/usr/local/www/services_unbound.php @@ -408,7 +408,7 @@ events.push(function(){ <div class="panel panel-default"> <div class="panel-heading"><h2 class="panel-title"><?=gettext("Host Overrides")?></h2></div> <div class="panel-body table-responsive"> - <table class="table table-striped table-hover table-condensed"> + <table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable> <thead> <tr> <th><?=gettext("Host")?></th> @@ -484,7 +484,7 @@ endforeach; <div class="panel panel-default"> <div class="panel-heading"><h2 class="panel-title"><?=gettext("Domain Overrides")?></h2></div> <div class="panel-body table-responsive"> - <table class="table table-striped table-hover table-condensed"> + <table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable> <thead> <tr> <th><?=gettext("Domain")?></th> diff --git a/src/usr/local/www/services_unbound_acls.php b/src/usr/local/www/services_unbound_acls.php index 661afc5..92fd87d 100644 --- a/src/usr/local/www/services_unbound_acls.php +++ b/src/usr/local/www/services_unbound_acls.php @@ -308,7 +308,7 @@ else // NOT 'edit' or 'add' <div class="panel-heading"><h2 class="panel-title"><?=gettext('Access Lists to control access to the DNS Resolver')?></h2></div> <div class="panel-body"> <div class="table-responsive"> - <table class="table table-striped table-hover table-condensed"> + <table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable> <thead> <tr> <th><?=gettext("Access List Name")?></th> diff --git a/src/usr/local/www/status_dhcp_leases.php b/src/usr/local/www/status_dhcp_leases.php index 041fbe8..036da36 100644 --- a/src/usr/local/www/status_dhcp_leases.php +++ b/src/usr/local/www/status_dhcp_leases.php @@ -335,7 +335,7 @@ if (count($pools) > 0) { <div class="panel panel-default"> <div class="panel-heading"><h2 class="panel-title"><?=gettext('Pool status')?></h2></div> <div class="panel-body table-responsive"> - <table class="table table-striped table-hover table-condensed"> + <table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable> <thead> <tr> <th><?=gettext("Failover Group")?></a></th> @@ -366,7 +366,7 @@ if (count($pools) > 0) { <div class="panel panel-default"> <div class="panel-heading"><h2 class="panel-title"><?=gettext('Leases')?></h2></div> <div class="panel-body table-responsive"> - <table class="table table-striped table-hover table-condensed"> + <table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable> <thead> <tr> <th><!-- icon --></th> @@ -463,7 +463,7 @@ foreach ($leases as $data): <div class="panel panel-default"> <div class="panel-heading"><h2 class="panel-title"><?=gettext('Leases in use')?></h2></div> <div class="panel-body table-responsive"> - <table class="table table-striped table-hover table-condensed"> + <table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable> <thead> <tr> <th><?=gettext("Interface")?></th> diff --git a/src/usr/local/www/status_dhcpv6_leases.php b/src/usr/local/www/status_dhcpv6_leases.php index 33ba5b7..3520197 100644 --- a/src/usr/local/www/status_dhcpv6_leases.php +++ b/src/usr/local/www/status_dhcpv6_leases.php @@ -405,7 +405,7 @@ if (count($pools) > 0) { <div class="panel panel-default"> <div class="panel-heading"><h2 class="panel-title"><?=gettext('Pool status')?></h2></div> <div class="panel-body"> - <table class="table"> + <table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable> <thead> <tr> <th><?=gettext("Failover Group")?></a></th> @@ -440,7 +440,7 @@ if (empty($leases)) <div class="panel panel-default"> <div class="panel-heading"><h2 class="panel-title"><?=gettext('Leases')?></h2></div> <div class="panel-body"> - <table class="table"> + <table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable> <thead> <tr> <th><!-- icon --></th> @@ -530,7 +530,7 @@ foreach ($leases as $data): <div class="panel panel-default"> <div class="panel-heading"><h2 class="panel-title"><?=gettext('Delegated Prefixes')?></h2></div> <div class="panel-body"> - <table class="table"> + <table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable> <thead> <tr> <th><?=gettext("IPv6 Prefix")?></th> diff --git a/src/usr/local/www/status_gateways.php b/src/usr/local/www/status_gateways.php index 5768846..a757ae0 100644 --- a/src/usr/local/www/status_gateways.php +++ b/src/usr/local/www/status_gateways.php @@ -92,7 +92,7 @@ display_top_tabs($tab_array); ?> <div class="table-responsive"> - <table class="table table-hover table-compact table-striped"> + <table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable> <thead> <tr> <th><?=gettext("Name"); ?></th> diff --git a/src/usr/local/www/status_lb_pool.php b/src/usr/local/www/status_lb_pool.php index 829c152..41a94f8 100644 --- a/src/usr/local/www/status_lb_pool.php +++ b/src/usr/local/www/status_lb_pool.php @@ -162,7 +162,7 @@ $rowsprinted = 0; <div class="panel panel-default"> <div class="panel-heading"><h2 class="panel-title">Load Balancer Pools</h2></div> <div class="panel-body table-responsive"> - <table class="table table-striped table-hover table-condensed"> + <table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable> <thead> <tr> <th><?=gettext("Name")?></th> diff --git a/src/usr/local/www/status_lb_vs.php b/src/usr/local/www/status_lb_vs.php index e0f1b80..94f3c71 100644 --- a/src/usr/local/www/status_lb_vs.php +++ b/src/usr/local/www/status_lb_vs.php @@ -99,7 +99,7 @@ if(empty($a_vs)) else { ?> <div class="table-responsive"></div> - <table class="table table-striped table-hover table-condensed"> + <table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable> <tr> <td><?=gettext("Name"); ?></td> <td><?=gettext("Address"); ?></td> diff --git a/src/usr/local/www/status_ntpd.php b/src/usr/local/www/status_ntpd.php index 30a282d..318a8d2 100644 --- a/src/usr/local/www/status_ntpd.php +++ b/src/usr/local/www/status_ntpd.php @@ -196,7 +196,7 @@ include("head.inc"); <div class="panel panel-default"> <div class="panel-heading"><h2 class="panel-title">Network Time Protocol Status</h2></div> <div class="panel-body"> - <table class="table table-striped table-hover table-condensed"> + <table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable> <thead> <tr> <th><?=gettext("Status"); ?></th> diff --git a/src/usr/local/www/status_openvpn.php b/src/usr/local/www/status_openvpn.php index c2b1e6b..006bd17 100644 --- a/src/usr/local/www/status_openvpn.php +++ b/src/usr/local/www/status_openvpn.php @@ -172,7 +172,7 @@ include("head.inc"); ?> <div class="panel panel-default"> <div class="panel-heading"><h2 class="panel-title"><?=htmlspecialchars($server['name']);?> <?=gettext('Client connections')?></h2></div> <div class="panel-body table-responsive"> - <table class="table table-striped table-hover"> + <table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable> <thead> <tr> <th><?=gettext("Common Name")?></th> @@ -236,7 +236,7 @@ include("head.inc"); ?> <div class="panel panel-default"> <div class="panel-heading"><h2 class="panel-title"><?=htmlspecialchars($server['name']);?> <?=gettext("Routing Table"); ?></h2></div> <div class="panel-body table-responsive"> - <table class="table table-striped table-hover"> + <table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable> <thead> <tr> <th><?=gettext("Common Name"); ?></th> @@ -284,7 +284,7 @@ include("head.inc"); ?> <div class="panel panel-default"> <div class="panel-heading"><h2 class="panel-title"><?=gettext("Peer to Peer Server Instance Statistics"); ?></h2></div> <div class="panel-body table-responsive"> - <table class="table table-striped table-hover"> + <table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable> <thead> <tr> <th><?=gettext("Name"); ?></th> @@ -339,7 +339,7 @@ include("head.inc"); ?> <div class="panel panel-default"> <div class="panel-heading"><h2 class="panel-title"><?=gettext("Client Instance Statistics"); ?></h2></div> <div class="panel-body table-responsive"> - <table class="table table-striped table-hover"> + <table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable> <thead> <tr> <th><?=gettext("Name"); ?></th> diff --git a/src/usr/local/www/status_services.php b/src/usr/local/www/status_services.php index 8928c87..4d1ec82 100755 --- a/src/usr/local/www/status_services.php +++ b/src/usr/local/www/status_services.php @@ -122,7 +122,7 @@ if (count($services) > 0) { <div class="panel-body panel-default"> <div class="table-responsive"> - <table class="table table-striped table-hover table-condensed"> + <table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable> <thead> <tr> <th><?=gettext("Service")?></th> diff --git a/src/usr/local/www/status_wireless.php b/src/usr/local/www/status_wireless.php index c5a71e5..8595f52 100644 --- a/src/usr/local/www/status_wireless.php +++ b/src/usr/local/www/status_wireless.php @@ -116,7 +116,7 @@ display_top_tabs($tab_array); <div class="panel-heading"><h2 class="panel-title"><?=gettext("Nearby access points or ad-hoc peers")?></h2></div> <div class="panel-body"> <div class="table-responsive"> - <table class="table table-striped table-hover table-condensed"> + <table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable> <thead> <tr> <th>SSID</th> diff --git a/src/usr/local/www/system_authservers.php b/src/usr/local/www/system_authservers.php index aaab5a9..7cf8908 100644 --- a/src/usr/local/www/system_authservers.php +++ b/src/usr/local/www/system_authservers.php @@ -399,7 +399,7 @@ if (!($act == "new" || $act == "edit" || $input_errors)) { ?> <div class="table-responsive"> - <table class="table table-striped table-hover"> + <table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable> <thead> <tr> <th><?=gettext("Server Name")?></th> diff --git a/src/usr/local/www/system_groupmanager.php b/src/usr/local/www/system_groupmanager.php index 0bf5f24..ca2999c 100644 --- a/src/usr/local/www/system_groupmanager.php +++ b/src/usr/local/www/system_groupmanager.php @@ -278,7 +278,7 @@ if (!($_GET['act'] == "new" || $_GET['act'] == "edit")) { ?> <div class="table-responsive"> - <table class="table table-striped table-hover"> + <table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable> <thead> <tr> <th><?=gettext("Group name")?></th> diff --git a/src/usr/local/www/system_usermanager.php b/src/usr/local/www/system_usermanager.php index 4ba072a..a226eee 100644 --- a/src/usr/local/www/system_usermanager.php +++ b/src/usr/local/www/system_usermanager.php @@ -470,7 +470,7 @@ if (!($act == "new" || $act == "edit" || $input_errors)) { ?> <div class="table-responsive"> - <table class="table table-striped table-hover"> + <table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable> <thead> <tr> <th> </th> diff --git a/src/usr/local/www/vpn_openvpn_client.php b/src/usr/local/www/vpn_openvpn_client.php index 348152e..f3bf78c 100644 --- a/src/usr/local/www/vpn_openvpn_client.php +++ b/src/usr/local/www/vpn_openvpn_client.php @@ -841,7 +841,7 @@ else: <div class="panel panel-default"> <div class="panel-heading"><h2 class="panel-title"><?=gettext('OpenVPN Clients')?></h2></div> <div class="panel-body table-responsive"> - <table class="table table-striped table-hover table-condensed"> + <table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable> <thead> <tr> <th><?=gettext("Protocol")?></th> diff --git a/src/usr/local/www/vpn_openvpn_server.php b/src/usr/local/www/vpn_openvpn_server.php index 1f5651e..01ce2ae 100644 --- a/src/usr/local/www/vpn_openvpn_server.php +++ b/src/usr/local/www/vpn_openvpn_server.php @@ -1280,7 +1280,7 @@ else: <div class="panel panel-default"> <div class="panel-heading"><h2 class="panel-title"><?=gettext('OpenVPN Servers')?></h2></div> <div class="panel-body table-responsive"> - <table class="table table-striped table-hover table-condensed"> + <table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable> <thead> <tr> <th><?=gettext("Protocol / Port")?></th> diff --git a/src/usr/local/www/widgets/widgets/captive_portal_status.widget.php b/src/usr/local/www/widgets/widgets/captive_portal_status.widget.php index f4ff9fb..67ce16f 100644 --- a/src/usr/local/www/widgets/widgets/captive_portal_status.widget.php +++ b/src/usr/local/www/widgets/widgets/captive_portal_status.widget.php @@ -127,7 +127,7 @@ if ($_GET['order']) { usort($cpdb_all, "clientcmp"); } ?> -<table class="table"> +<table class="table table-condensed sortable-theme-bootstrap" data-sortable> <thead> <tr> <th><a href="?order=ip&showact=<?=$showact;?>">IP address</a></td> diff --git a/src/usr/local/www/widgets/widgets/openvpn.widget.php b/src/usr/local/www/widgets/widgets/openvpn.widget.php index 1f3c44f..e0ec293 100644 --- a/src/usr/local/www/widgets/widgets/openvpn.widget.php +++ b/src/usr/local/www/widgets/widgets/openvpn.widget.php @@ -150,7 +150,7 @@ $clients = openvpn_get_active_clients(); <div class="widget panel panel-default"> <div class="panel-heading"><h2 class="panel-title"><?=htmlspecialchars($server['name']);?></h2></div> <div class="table-responsive"> - <table class="table table striped table-hover table-condensed"> + <table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable> <thead> <tr> <th>Name/Time</th> |