From 1b7379f9e35758842e091a79150feaf2ac1e416b Mon Sep 17 00:00:00 2001 From: Jared Dillard Date: Wed, 18 Nov 2015 16:27:36 -0600 Subject: Ticket #5471 another convert batch to font-awesome icons --- src/usr/local/www/carp_status.php | 10 ++++----- src/usr/local/www/diag_dump_states.php | 2 +- src/usr/local/www/firewall_nat.php | 16 +++++++-------- src/usr/local/www/firewall_nat_1to1.php | 2 +- src/usr/local/www/firewall_nat_out.php | 14 ++++++------- src/usr/local/www/firewall_rules.php | 24 +++++++++++----------- src/usr/local/www/index.php | 24 +++++++++++----------- src/usr/local/www/pkg_mgr.php | 10 ++++----- src/usr/local/www/services_dhcp.php | 2 +- src/usr/local/www/status_dhcp_leases.php | 8 ++++---- src/usr/local/www/status_dhcpv6_leases.php | 16 +++++++-------- src/usr/local/www/status_openvpn.php | 2 +- src/usr/local/www/system_gateways.php | 10 ++++----- src/usr/local/www/system_routes.php | 8 ++++---- src/usr/local/www/system_usermanager.php | 2 +- src/usr/local/www/widgets/widgets/ipsec.widget.php | 4 ++-- src/usr/local/www/widgets/widgets/log.widget.php | 8 ++++---- .../local/www/widgets/widgets/openvpn.widget.php | 10 ++++----- .../www/widgets/widgets/services_status.widget.php | 4 ++-- .../www/widgets/widgets/smart_status.widget.php | 2 +- 20 files changed, 89 insertions(+), 89 deletions(-) (limited to 'src/usr') diff --git a/src/usr/local/www/carp_status.php b/src/usr/local/www/carp_status.php index abbf305..be09bd2 100644 --- a/src/usr/local/www/carp_status.php +++ b/src/usr/local/www/carp_status.php @@ -234,22 +234,22 @@ if ($carpcount == 0) { $status = get_carp_interface_status("{$carp['interface']}_vip{$carp['vhid']}"); if($carp_enabled == false) { - $icon = 'remove-sign'; + $icon = 'times-circle'; $status = "DISABLED"; } else { if ($status == "MASTER") { - $icon = 'ok-sign'; + $icon = 'check-circle'; } else if ($status == "BACKUP") { - $icon = 'ok-circle'; + $icon = 'check-circle-o'; } else if ($status == "INIT") { - $icon = 'question-sign'; + $icon = 'question-circle'; } } ?> @ -   +   diff --git a/src/usr/local/www/diag_dump_states.php b/src/usr/local/www/diag_dump_states.php index 96d20b7..f255b22 100755 --- a/src/usr/local/www/diag_dump_states.php +++ b/src/usr/local/www/diag_dump_states.php @@ -209,7 +209,7 @@ print $form; - diff --git a/src/usr/local/www/firewall_nat.php b/src/usr/local/www/firewall_nat.php index df0c222..d685f5e 100644 --- a/src/usr/local/www/firewall_nat.php +++ b/src/usr/local/www/firewall_nat.php @@ -234,11 +234,11 @@ foreach ($a_nat as $natent): - "> + "> - . "> + . "> @@ -272,7 +272,7 @@ foreach ($a_nat as $natent): - + @@ -289,7 +289,7 @@ foreach ($a_nat as $natent): - + @@ -307,7 +307,7 @@ foreach ($a_nat as $natent): - + @@ -324,7 +324,7 @@ foreach ($a_nat as $natent): - + @@ -414,8 +414,8 @@ if (count($a_nat) > 0) {
-
-
+
+
diff --git a/src/usr/local/www/firewall_nat_1to1.php b/src/usr/local/www/firewall_nat_1to1.php index 0cfdf73..17599c8 100644 --- a/src/usr/local/www/firewall_nat_1to1.php +++ b/src/usr/local/www/firewall_nat_1to1.php @@ -207,7 +207,7 @@ display_top_tabs($tab_array); - " title=""> + " title=""> diff --git a/src/usr/local/www/firewall_nat_out.php b/src/usr/local/www/firewall_nat_out.php index ab7a1e3..2126e75 100644 --- a/src/usr/local/www/firewall_nat_out.php +++ b/src/usr/local/www/firewall_nat_out.php @@ -348,12 +348,12 @@ print($form); - " title=""> + " title=""> - " title=""> + " title=""> - + @@ -403,7 +403,7 @@ print($form); - + - + - + - "> + "> diff --git a/src/usr/local/www/firewall_rules.php b/src/usr/local/www/firewall_rules.php index 468792d..51af1f3 100644 --- a/src/usr/local/www/firewall_rules.php +++ b/src/usr/local/www/firewall_rules.php @@ -291,7 +291,7 @@ display_top_tabs($tab_array); ?> - "> + "> * * * @@ -309,7 +309,7 @@ display_top_tabs($tab_array); - "> + "> * * @@ -327,7 +327,7 @@ display_top_tabs($tab_array); - "> + "> * * @@ -363,7 +363,7 @@ for ($i = 0; isset($a_filter[$i]); $i++): - + '; if (isset($filterent['log'])) - print ''; + print ''; ?>
-
-
-
-
-
+
+
+
+
+
diff --git a/src/usr/local/www/index.php b/src/usr/local/www/index.php index 9726856..59441ad 100644 --- a/src/usr/local/www/index.php +++ b/src/usr/local/www/index.php @@ -290,7 +290,7 @@ pfSense_handle_custom_code("/usr/local/pkg/dashboard/pre_dashboard");
- +
@@ -301,7 +301,7 @@ pfSense_handle_custom_code("/usr/local/pkg/dashboard/pre_dashboard"); foreach ($widgets as $widgetname => $widgetconfig): if ($widgetconfig['display'] == 'none'): ?> -
+
@@ -364,16 +364,16 @@ foreach ($widgets as $widgetname => $widgetconfig)
- + - + - +
@@ -419,12 +419,12 @@ events.push(function() { var body = $(el).parents('.panel').children('.panel-body') var isOpen = body.hasClass('in'); - $(el).children('i').toggleClass('icon-plus-sign', !isOpen); - $(el).children('i').toggleClass('icon-minus-sign', isOpen); + $(el).children('i').toggleClass('fa-plus-circle', !isOpen); + $(el).children('i').toggleClass('fa-minus-circle', isOpen); body.on('shown.bs.collapse', function(){ - $(el).children('i').toggleClass('icon-minus-sign', true); - $(el).children('i').toggleClass('icon-plus-sign', false); + $(el).children('i').toggleClass('fa-minus-circle', true); + $(el).children('i').toggleClass('fa-plus-circle', false); if($(el).closest('a').attr('name') != 'widgets-available') { updateWidgets(); @@ -432,8 +432,8 @@ events.push(function() { }); body.on('hidden.bs.collapse', function(){ - $(el).children('i').toggleClass('icon-minus-sign', false); - $(el).children('i').toggleClass('icon-plus-sign', true); + $(el).children('i').toggleClass('fa-minus-circle', false); + $(el).children('i').toggleClass('fa-plus-circle', true); if($(el).closest('a').attr('name') != 'widgets-available') { updateWidgets(); diff --git a/src/usr/local/www/pkg_mgr.php b/src/usr/local/www/pkg_mgr.php index c88bbee..fb035a9 100644 --- a/src/usr/local/www/pkg_mgr.php +++ b/src/usr/local/www/pkg_mgr.php @@ -143,7 +143,7 @@ if(!$pkg_info || !is_array($pkg_info)):?>
- +
@@ -242,12 +242,12 @@ events.push(function(){ var body = $(el).parents('.panel').children('.panel-body') var isOpen = body.hasClass('in'); - $(el).children('i').toggleClass('icon-plus-sign', !isOpen); - $(el).children('i').toggleClass('icon-minus-sign', isOpen); + $(el).children('i').toggleClass('fa-plus-circle', !isOpen); + $(el).children('i').toggleClass('fa-minus-circle', isOpen); body.on('shown.bs.collapse', function(){ - $(el).children('i').toggleClass('icon-minus-sign', true); - $(el).children('i').toggleClass('icon-plus-sign', false); + $(el).children('i').toggleClass('fa-minus-circle', true); + $(el).children('i').toggleClass('fa-plus-circle', false); }); }); diff --git a/src/usr/local/www/services_dhcp.php b/src/usr/local/www/services_dhcp.php index 9dff157..7c17e28 100644 --- a/src/usr/local/www/services_dhcp.php +++ b/src/usr/local/www/services_dhcp.php @@ -1308,7 +1308,7 @@ if (!is_numeric($pool) && !($act == "newpool")) { - + diff --git a/src/usr/local/www/status_dhcp_leases.php b/src/usr/local/www/status_dhcp_leases.php index 036da36..a57fca7 100644 --- a/src/usr/local/www/status_dhcp_leases.php +++ b/src/usr/local/www/status_dhcp_leases.php @@ -389,11 +389,11 @@ foreach ($leases as $data): continue; if ($data['act'] == 'active') - $icon = 'icon-ok-circle'; + $icon = 'fa-check-circle-o'; elseif ($data['act'] == 'expired') - $icon = 'icon-ban-circle'; + $icon = 'fa-ban'; else - $icon = 'icon-remove-circle'; + $icon = 'fa-times-circle-o'; $lip = ip2ulong($data['ip']); @@ -419,7 +419,7 @@ foreach ($leases as $data): $mac_hi = strtoupper($mac[0] . $mac[1] . $mac[3] . $mac[4] . $mac[6] . $mac[7]); ?> - + diff --git a/src/usr/local/www/status_dhcpv6_leases.php b/src/usr/local/www/status_dhcpv6_leases.php index 3520197..54b634e 100644 --- a/src/usr/local/www/status_dhcpv6_leases.php +++ b/src/usr/local/www/status_dhcpv6_leases.php @@ -462,11 +462,11 @@ foreach ($leases as $data): continue; if ($data['act'] == 'active') - $icon = 'icon-ok-circle'; + $icon = 'fa-check-circle-o'; elseif ($data['act'] == 'expired') - $icon = 'icon-ban-circle'; + $icon = 'fa-ban'; else - $icon = 'icon-remove-circle'; + $icon = 'fa-times-circle-o'; if ($data['act'] == "static") { foreach ($config['dhcpdv6'] as $dhcpif => $dhcpifconf) { @@ -490,7 +490,7 @@ foreach ($leases as $data): $mac_hi = strtoupper($mac[0] . $mac[1] . $mac[3] . $mac[4] . $mac[6] . $mac[7]); ?> - + @@ -548,11 +548,11 @@ foreach ($prefixes as $data): continue; if ($data['act'] == 'active') - $icon = 'icon-ok-circle'; + $icon = 'fa-check-circle-o'; elseif ($data['act'] == 'expired') - $icon = 'icon-ban-circle'; + $icon = 'fa-ban'; else - $icon = 'icon-remove-circle'; + $icon = 'fa-times-circle-o'; if ($data['act'] == "static") { foreach ($config['dhcpdv6'] as $dhcpif => $dhcpifconf) { @@ -577,7 +577,7 @@ foreach ($prefixes as $data): } ?> - + diff --git a/src/usr/local/www/status_openvpn.php b/src/usr/local/www/status_openvpn.php index 006bd17..38d7921 100644 --- a/src/usr/local/www/status_openvpn.php +++ b/src/usr/local/www/status_openvpn.php @@ -200,7 +200,7 @@ include("head.inc"); ?> onclick="killClient('', '');" style="cursor:pointer;" id="" title=""> - + diff --git a/src/usr/local/www/system_gateways.php b/src/usr/local/www/system_gateways.php index 3192de2..a52a027 100644 --- a/src/usr/local/www/system_gateways.php +++ b/src/usr/local/www/system_gateways.php @@ -271,19 +271,19 @@ display_top_tabs($tab_array); $gateway): if (isset($gateway['inactive'])) - $icon = 'icon-remove-circle'; + $icon = 'fa-times-circle-o'; elseif (isset($gateway['disabled'])) - $icon = 'icon-ban-circle'; + $icon = 'fa-ban'; else - $icon = 'icon-ok-circle'; + $icon = 'fa-check-circle-o'; if (isset($gateway['inactive'])) $title = gettext("This gateway is inactive because interface is missing"); else $title = ''; ?> - > - + > + $route): if (isset($route['disabled'])) - $icon = 'icon-ban-circle'; + $icon = 'fa-ban'; else - $icon = 'icon-ok-circle'; + $icon = 'fa-check-circle-o'; ?> - > - + > + diff --git a/src/usr/local/www/system_usermanager.php b/src/usr/local/www/system_usermanager.php index 88a040d..5950fb4 100644 --- a/src/usr/local/www/system_usermanager.php +++ b/src/usr/local/www/system_usermanager.php @@ -499,7 +499,7 @@ foreach($a_user as $i => $userent): else $usrimg = 'user'; ?> - + diff --git a/src/usr/local/www/widgets/widgets/ipsec.widget.php b/src/usr/local/www/widgets/widgets/ipsec.widget.php index 74276d5..e0baa12 100644 --- a/src/usr/local/www/widgets/widgets/ipsec.widget.php +++ b/src/usr/local/www/widgets/widgets/ipsec.widget.php @@ -192,9 +192,9 @@ if (isset($config['ipsec']['phase2'])): ?> - + - + diff --git a/src/usr/local/www/widgets/widgets/log.widget.php b/src/usr/local/www/widgets/widgets/log.widget.php index 5811ff0..35dd074 100644 --- a/src/usr/local/www/widgets/widgets/log.widget.php +++ b/src/usr/local/www/widgets/widgets/log.widget.php @@ -147,13 +147,13 @@ else } if ($filterent['act'] == "block") - $iconfn = "remove"; + $iconfn = "times"; else if ($filterent['act'] == "reject") $iconfn = "fire"; else if ($filterent['act'] == "match") $iconfn = "filter"; else - $iconfn = "ok"; + $iconfn = "check"; $rule = find_rule_by_number($filterent['rulenum'], $filterent['tracker'], $filterent['act']); @@ -166,7 +166,7 @@ else role="button" data-toggle="popover" data-trigger="hover" data-title="Rule that triggered this action" data-content=""> + class="fa fa-"> @@ -302,4 +302,4 @@ function outputrule(req) { alert(req.content); } - \ No newline at end of file + diff --git a/src/usr/local/www/widgets/widgets/openvpn.widget.php b/src/usr/local/www/widgets/widgets/openvpn.widget.php index fae937a..b97c2e4 100644 --- a/src/usr/local/www/widgets/widgets/openvpn.widget.php +++ b/src/usr/local/www/widgets/widgets/openvpn.widget.php @@ -168,7 +168,7 @@ $clients = openvpn_get_active_clients(); - ' title='Kill client connection from '> @@ -215,10 +215,10 @@ $clients = openvpn_get_active_clients(); '; + echo ''; } else { /* tunnel is down */ - echo ''; + echo ''; } ?> @@ -265,10 +265,10 @@ $clients = openvpn_get_active_clients(); '; + echo ''; } else { /* tunnel is down */ - echo ''; + echo ''; } ?> diff --git a/src/usr/local/www/widgets/widgets/services_status.widget.php b/src/usr/local/www/widgets/widgets/services_status.widget.php index ab74aa0..d942c10 100644 --- a/src/usr/local/www/widgets/widgets/services_status.widget.php +++ b/src/usr/local/www/widgets/widgets/services_status.widget.php @@ -100,7 +100,7 @@ if (count($services) > 0) { $service_desc = explode(".",$service['description']); ?> - + @@ -134,4 +134,4 @@ if (count($services) > 0) {
- \ No newline at end of file + diff --git a/src/usr/local/www/widgets/widgets/smart_status.widget.php b/src/usr/local/www/widgets/widgets/smart_status.widget.php index 5c61e12..5140487 100644 --- a/src/usr/local/www/widgets/widgets/smart_status.widget.php +++ b/src/usr/local/www/widgets/widgets/smart_status.widget.php @@ -98,7 +98,7 @@ if (count($devs) > 0) { } ?> - + -- cgit v1.1