From 15b6dcac6ae1697336a762b955cbde19d30047c4 Mon Sep 17 00:00:00 2001
From: jim-p <jimp@pfsense.org>
Date: Tue, 8 Mar 2016 11:14:58 -0500
Subject: Correct some icon usage inconsistencies. Fixes #5965

---
 src/usr/local/www/firewall_nat_1to1.php            |  2 +-
 src/usr/local/www/status_dhcp_leases.php           |  5 ++++-
 src/usr/local/www/status_dhcpv6_leases.php         |  5 ++++-
 src/usr/local/www/status_logs_vpn.php              |  8 ++++----
 src/usr/local/www/status_wireless.php              |  2 +-
 src/usr/local/www/system_crlmanager.php            | 22 ++++++++--------------
 src/usr/local/www/widgets/widgets/ipsec.widget.php |  4 ++--
 .../www/widgets/widgets/wake_on_lan.widget.php     |  8 ++++----
 8 files changed, 28 insertions(+), 28 deletions(-)

(limited to 'src/usr/local')

diff --git a/src/usr/local/www/firewall_nat_1to1.php b/src/usr/local/www/firewall_nat_1to1.php
index 0c77c76..2750da6 100644
--- a/src/usr/local/www/firewall_nat_1to1.php
+++ b/src/usr/local/www/firewall_nat_1to1.php
@@ -210,7 +210,7 @@ display_top_tabs($tab_array);
 							<a href="?act=toggle&amp;id=<?=$i?>">
 								<i class="fa <?= ($iconfn == "pass") ? "fa-check":"fa-times"?>" title="<?=gettext("click to toggle enabled/disabled status")?>"></i>
 <?php 				if (isset($natent['nobinat'])) { ?>
-								&nbsp;<i class="fa fa-hand-paper-o text-danger" title="<?=gettext("Negated: This rule excludes NAT from a later rule")?>"></i>
+								&nbsp;<i class="fa fa-hand-stop-o text-danger" title="<?=gettext("Negated: This rule excludes NAT from a later rule")?>"></i>
 <?php 				} ?>
 							</a>
 						</td>
diff --git a/src/usr/local/www/status_dhcp_leases.php b/src/usr/local/www/status_dhcp_leases.php
index 48d7b33..a6710bf 100644
--- a/src/usr/local/www/status_dhcp_leases.php
+++ b/src/usr/local/www/status_dhcp_leases.php
@@ -398,11 +398,14 @@ foreach ($leases as $data):
 	}
 
 	if ($data['act'] == $active_string) {
+		/* Active DHCP Lease */
 		$icon = 'fa-check-circle-o';
 	} elseif ($data['act'] == $expired_string) {
+		/* Expired DHCP Lease */
 		$icon = 'fa-ban';
 	} else {
-		$icon = 'fa-times-circle-o';
+		/* Static Mapping */
+		$icon = 'fa-user';
 	}
 
 	if ($data['act'] != $static_string) {
diff --git a/src/usr/local/www/status_dhcpv6_leases.php b/src/usr/local/www/status_dhcpv6_leases.php
index 9b7f37e..d56eb67 100644
--- a/src/usr/local/www/status_dhcpv6_leases.php
+++ b/src/usr/local/www/status_dhcpv6_leases.php
@@ -474,11 +474,14 @@ foreach ($leases as $data):
 	}
 
 	if ($data['act'] == $active_string) {
+		/* Active DHCP Lease */
 		$icon = 'fa-check-circle-o';
 	} elseif ($data['act'] == $expired_string) {
+		/* Expired DHCP Lease */
 		$icon = 'fa-ban';
 	} else {
-		$icon = 'fa-times-circle-o';
+		/* Static Mapping */
+		$icon = 'fa-user';
 	}
 
 	if ($data['act'] == $static_string) {
diff --git a/src/usr/local/www/status_logs_vpn.php b/src/usr/local/www/status_logs_vpn.php
index 7500c81..a4c251f 100644
--- a/src/usr/local/www/status_logs_vpn.php
+++ b/src/usr/local/www/status_logs_vpn.php
@@ -183,9 +183,9 @@ if (!$rawfilter) {
 						</td>
 						<td style="word-wrap:break-word; word-break:break-all; white-space:normal">
 							<?php if ($filterent['action'] == "login") { ?>
-							<i class="fa fa-arrow-left" title="in"></i>
+							<i class="fa fa-sign-in" title="User Logged In"></i>
 							<?php } else if ($filterent['action'] == "logout") { ?>
-							<i class="fa fa-arrow-right" title="out"></i>
+							<i class="fa fa-sign-out" title="User Logged Out"></i>
 							<?php } else { ?>
 							<i><?=htmlspecialchars($filterent['action'])?></i>
 							<?php } ?>
@@ -310,9 +310,9 @@ function dump_clog_vpn($logfile, $tail) {
 		echo "<td>" . htmlspecialchars(join(" ", array_slice($logent, 0, 3))) . "</td>\n";
 
 		if ($llent[0] == "login") {
-			echo "<td><i class=\"fa fa-arrow-left\" alt=\"in\"></i></td>\n";
+			echo "<td><i class=\"fa fa-sign-in\" title=\"User Logged In\"></i></td>\n";
 		} else {
-			echo "<td><i class=\"fa fa-arrow-right\" alt=\"out\"></i></td>\n";
+			echo "<td><i class=\"fa fa-sign-out\" title=\"User Logged Out\"></i></td>\n";
 		}
 
 		echo "<td>" . htmlspecialchars($llent[3]) . "</td>\n";
diff --git a/src/usr/local/www/status_wireless.php b/src/usr/local/www/status_wireless.php
index af2b6d7..c2c3b2b 100644
--- a/src/usr/local/www/status_wireless.php
+++ b/src/usr/local/www/status_wireless.php
@@ -237,7 +237,7 @@ display_top_tabs($tab_array);
 	<nav class="action-buttons">
 		<input type="hidden" name="if" id="if" value="<?=htmlspecialchars($if)?>" />
 		<button type="submit" class="btn btn-success" name="rescanwifi" id="rescanwifi" value="Rescan">
-			<i class="fa fa-undo icon-embed-btn"></i>
+			<i class="fa fa-refresh icon-embed-btn"></i>
 			<?=gettext("Rescan")?>
 		</button>
 	</nav>
diff --git a/src/usr/local/www/system_crlmanager.php b/src/usr/local/www/system_crlmanager.php
index dd9e778..e94917f 100644
--- a/src/usr/local/www/system_crlmanager.php
+++ b/src/usr/local/www/system_crlmanager.php
@@ -526,8 +526,8 @@ if ($act == "new" || $act == gettext("Save") || $input_errors) {
 							<?=date("D M j G:i:s T Y", $cert["revoke_time"]); ?>
 						</td>
 						<td class="list">
-							<a href="system_crlmanager.php?act=delcert&amp;id=<?=$crl['refid']; ?>&amp;certref=<?=$cert['refid']; ?>" onclick="return confirm('<?=gettext("Do you really want to delete this Certificate from the CRL?")?>')">
-								<i class="fa fa-times-circle" title="<?=gettext("Delete this certificate from the CRL ")?>" alt="<?=gettext("Delete this certificate from the CRL ")?>"></i>
+							<a href="system_crlmanager.php?act=delcert&amp;id=<?=$crl['refid']; ?>&amp;certref=<?=$cert['refid']; ?>">
+								<i class="fa fa-trash" title="<?=gettext("Delete this certificate from the CRL")?>" alt="<?=gettext("Delete this certificate from the CRL")?>"></i>
 							</a>
 						</td>
 					</tr>
@@ -645,12 +645,14 @@ if ($act == "new" || $act == gettext("Save") || $input_errors) {
 		if ($cainternal == "YES"):
 ?>
 							<a href="system_crlmanager.php?act=new&amp;caref=<?=$ca['refid']; ?>" class="btn btn-xs btn-success">
+								<i class="fa fa-plus icon-embed-btn"></i>
 								<?=gettext("Add or Import CRL")?>
 							</a>
 <?php
 		else:
 ?>
 							<a href="system_crlmanager.php?act=new&amp;caref=<?=$ca['refid']; ?>&amp;importonly=yes" class="btn btn-xs btn-success">
+								<i class="fa fa-plus icon-embed-btn"></i>
 								<?=gettext("Add or Import CRL")?>
 							</a>
 <?php
@@ -671,26 +673,18 @@ if ($act == "new" || $act == gettext("Save") || $input_errors) {
 						<td><?=($internal) ? count($tmpcrl['cert']) : "Unknown (imported)"; ?></td>
 						<td><?=($inuse) ? "YES" : "NO"; ?></td>
 						<td>
-							<a href="system_crlmanager.php?act=exp&amp;id=<?=$tmpcrl['refid']?>" class="btn btn-xs btn-success">
-								<?=gettext("Export CRL")?>
-							</a>
+							<a href="system_crlmanager.php?act=exp&amp;id=<?=$tmpcrl['refid']?>" class="fa fa-download" title="<?=gettext("Export CRL")?>"></a>
 <?php
 				if ($internal): ?>
-							<a href="system_crlmanager.php?act=edit&amp;id=<?=$tmpcrl['refid']?>" class="btn btn-xs btn-info">
-								<?=gettext("Edit CRL")?>
-							</a>
+							<a href="system_crlmanager.php?act=edit&amp;id=<?=$tmpcrl['refid']?>" class="fa fa-pencil" title="<?=gettext("Edit CRL")?>"></a>
 <?php
 				else:
 ?>
-							<a href="system_crlmanager.php?act=editimported&amp;id=<?=$tmpcrl['refid']?>" class="btn btn-xs btn-info">
-								<?=gettext("Edit CRL")?>
-							</a>
+							<a href="system_crlmanager.php?act=editimported&amp;id=<?=$tmpcrl['refid']?>" class="fa fa-pencil" title="<?=gettext("Edit CRL")?>"></a>
 <?php			endif;
 				if (!$inuse):
 ?>
-							<a href="system_crlmanager.php?act=del&amp;id=<?=$tmpcrl['refid']?>" class="btn btn-xs btn-danger">
-								<?=gettext("Delete CRL")?>
-							</a>
+							<a href="system_crlmanager.php?act=del&amp;id=<?=$tmpcrl['refid']?>" class="fa fa-trash" title="<?=gettext("Delete CRL")?>"></a>
 <?php
 				endif;
 ?>
diff --git a/src/usr/local/www/widgets/widgets/ipsec.widget.php b/src/usr/local/www/widgets/widgets/ipsec.widget.php
index aa64ff4..b05482c 100644
--- a/src/usr/local/www/widgets/widgets/ipsec.widget.php
+++ b/src/usr/local/www/widgets/widgets/ipsec.widget.php
@@ -171,9 +171,9 @@ if ($_REQUEST && $_REQUEST['ajax']) {
 				print(		"<td>" . htmlspecialchars($ipsec['descr']) . "</td>\n");
 
 				if ($ipsec['status'] == "true") {
-					print('<td><i class="fa fa-chevron-up"></i></td>' . "\n");
+					print('<td><i class="fa fa-arrow-up"></i></td>' . "\n");
 				} else {
-					print('<td><i class="fa fa-chevron-down"></i></td>' . "\n");
+					print('<td><i class="fa fa-arrow-down"></i></td>' . "\n");
 				}
 
 				print(	"</tr>\n");
diff --git a/src/usr/local/www/widgets/widgets/wake_on_lan.widget.php b/src/usr/local/www/widgets/widgets/wake_on_lan.widget.php
index 57edd9b..60628b9 100644
--- a/src/usr/local/www/widgets/widgets/wake_on_lan.widget.php
+++ b/src/usr/local/www/widgets/widgets/wake_on_lan.widget.php
@@ -93,16 +93,16 @@ if (count($wolcomputers) > 0):
 			</td>
 			<td>
 		<?php if ($status == 'expires'): ?>
-				<i class="fa fa-arrow-right" data-toggle="tooltip" title="<?= gettext("Online") ?>"></i>
+				<i class="fa fa-arrow-up" data-toggle="tooltip" title="<?= gettext("Online") ?>"></i>
 		<?php elseif ($status == 'permanent'): ?>
-				<i class="fa fa-arrow-right" data-toggle="tooltip" title="<?= gettext("Static ARP") ?>"></i>
+				<i class="fa fa-arrow-up" data-toggle="tooltip" title="<?= gettext("Static ARP") ?>"></i>
 		<?php else: ?>
-				<i class="fa fa-ban" data-toggle="tooltip" title="<?= gettext("Offline") ?>"></i>
+				<i class="fa fa-arrow-down" data-toggle="tooltip" title="<?= gettext("Offline") ?>"></i>
 		<?php endif; ?>
 			</td>
 			<td>
 				<a href="services_wol.php?mac=<?= $wolent['mac'] ?>&amp;if=<?= $wolent['interface']?>">
-				<i class="fa fa-bed" data-toggle="tooltip" title="<?= gettext("Wake up!") ?>"></i>
+				<i class="fa fa-power-off" data-toggle="tooltip" title="<?= gettext("Wake up!") ?>"></i>
 				</a>
 			</td>
 		</tr>
-- 
cgit v1.1