From 29620ab549c040eea6ebba32acc170a54fc9017d Mon Sep 17 00:00:00 2001
From: Jared Dillard <jdillard@netgate.com>
Date: Sat, 12 Dec 2015 12:50:51 -0600
Subject: Fixed #5620 change css classes from icon- to text-

---
 src/etc/inc/filter_log.inc                       |  4 ++--
 src/usr/local/www/firewall_rules.php             | 18 +++++++++---------
 src/usr/local/www/status_logs_filter.php         |  4 ++--
 src/usr/local/www/status_logs_filter_dynamic.php |  4 ++--
 src/usr/local/www/widgets/widgets/log.widget.php |  6 +++---
 5 files changed, 18 insertions(+), 18 deletions(-)

(limited to 'src')

diff --git a/src/etc/inc/filter_log.inc b/src/etc/inc/filter_log.inc
index fbf7c3b..71b05b4 100644
--- a/src/etc/inc/filter_log.inc
+++ b/src/etc/inc/filter_log.inc
@@ -573,9 +573,9 @@ function handle_ajax($nentries, $tail = 50) {
 				}
 
 				if ($log_row['act'] == "block") {
-					$icon_act = "fa-times icon-danger";
+					$icon_act = "fa-times text-danger";
 				} else {
-					$icon_act = "fa-check icon-success";
+					$icon_act = "fa-check text-success";
 				}
 
 				$btn = '<i class="fa ' . $icon_act . ' icon-pointer" title="' . $log_row['act'] . '/' . $log_row['tracker'] . '" onclick="javascript:getURL(\'status_logs_filter.php?getrulenum=' . $log_row['rulenum'] . ',' . $log_row['tracker'] . ',' . $log_row['act'] . '\', outputrule);"></i>';
diff --git a/src/usr/local/www/firewall_rules.php b/src/usr/local/www/firewall_rules.php
index 70371de..641f647 100644
--- a/src/usr/local/www/firewall_rules.php
+++ b/src/usr/local/www/firewall_rules.php
@@ -303,7 +303,7 @@ display_top_tabs($tab_array);
 ?>
 					<tr id="antilockout">
 						<td></td>
-						<td title="<?=gettext("traffic is passed")?>"><i class="fa fa-check icon-success"></i></td>
+						<td title="<?=gettext("traffic is passed")?>"><i class="fa fa-check text-success"></i></td>
 						<td>*</td>
 						<td>*</td>
 						<td>*</td>
@@ -321,7 +321,7 @@ display_top_tabs($tab_array);
 <?php if (isset($config['interfaces'][$if]['blockpriv'])): ?>
 					<tr id="frrfc1918">
 						<td></td>
-						<td title="<?=gettext("traffic is blocked")?>"><i class="fa fa-times icon-danger"></i></td>
+						<td title="<?=gettext("traffic is blocked")?>"><i class="fa fa-times text-danger"></i></td>
 						<td>*</td>
 						<td><?=gettext("RFC 1918 networks");?></td>
 						<td>*</td>
@@ -339,7 +339,7 @@ display_top_tabs($tab_array);
 <?php if (isset($config['interfaces'][$if]['blockbogons'])): ?>
 					<tr id="frrfc1918">
 					<td></td>
-						<td title="<?=gettext("traffic is blocked")?>"><i class="fa fa-times icon-danger"></i></td>
+						<td title="<?=gettext("traffic is blocked")?>"><i class="fa fa-times text-danger"></i></td>
 						<td>*</td>
 						<td><?=gettext("Reserved/not assigned by IANA");?></td>
 						<td>*</td>
@@ -375,16 +375,16 @@ for ($i = 0; isset($a_filter[$i]); $i++):
 
 	<?php
 		if ($filterent['type'] == "block") {
-			$iconfn = "times icon-danger";
+			$iconfn = "times text-danger";
 			$title_text = gettext("traffic is blocked");
 		} else if ($filterent['type'] == "reject") {
-			$iconfn = "hand-stop-o icon-warning";
+			$iconfn = "hand-stop-o text-warning";
 			$title_text = gettext("traffic is rejected");
 		} else if ($filterent['type'] == "match") {
 			$iconfn = "filter";
 			$title_text = gettext("traffic is matched");
 		} else {
-			$iconfn = "check icon-success";
+			$iconfn = "check text-success";
 			$title_text = gettext("traffic is passed");
 		}
 	?>
@@ -691,10 +691,10 @@ for ($i = 0; isset($a_filter[$i]); $i++):
 		<dl class="dl-horizontal responsive">
 		<!-- Legend -->
 			<dt><?=gettext('Legend')?></dt>				<dd></dd>
-			<dt><i class="fa fa-check icon-success"></i></dt>		<dd><?=gettext("Pass");?></dd>
+			<dt><i class="fa fa-check text-success"></i></dt>		<dd><?=gettext("Pass");?></dd>
 			<dt><i class="fa fa-filter"></i></dt>	<dd><?=gettext("Match");?></dd>
-			<dt><i class="fa fa-times icon-danger"></i></dt>	<dd><?=gettext("Block");?></dd>
-			<dt><i class="fa fa-hand-stop-o icon-warning"></i></dt>		<dd><?=gettext("Reject");?></dd>
+			<dt><i class="fa fa-times text-danger"></i></dt>	<dd><?=gettext("Block");?></dd>
+			<dt><i class="fa fa-hand-stop-o text-warning"></i></dt>		<dd><?=gettext("Reject");?></dd>
 			<dt><i class="fa fa-tasks"></i></dt>	<dd> <?=gettext("Log");?></dd>
 			<dt><i class="fa fa-cog"></i></dt>		<dd> <?=gettext("Advanced filter");?></dd>
 		</dl>
diff --git a/src/usr/local/www/status_logs_filter.php b/src/usr/local/www/status_logs_filter.php
index 0575c5c..6ccd914 100644
--- a/src/usr/local/www/status_logs_filter.php
+++ b/src/usr/local/www/status_logs_filter.php
@@ -419,9 +419,9 @@ if (!isset($config['syslog']['rawfilter'])) {
 				<td>
 <?php
 		if ($filterent['act'] == "block") {
-			$icon_act = "fa-times icon-danger";
+			$icon_act = "fa-times text-danger";
 		} else {
-			$icon_act = "fa-check icon-success";
+			$icon_act = "fa-check text-success";
 		}
 ?>
 					<i class="fa <?php echo $icon_act;?> icon-pointer" title="<?php echo $filterent['act'] .'/'. $filterent['tracker'];?>" onclick="javascript:getURL('status_logs_filter.php?getrulenum=<?="{$filterent['rulenum']},{$filterent['tracker']},{$filterent['act']}"; ?>', outputrule);"></i>
diff --git a/src/usr/local/www/status_logs_filter_dynamic.php b/src/usr/local/www/status_logs_filter_dynamic.php
index 9bc9044..63771f5 100755
--- a/src/usr/local/www/status_logs_filter_dynamic.php
+++ b/src/usr/local/www/status_logs_filter_dynamic.php
@@ -394,9 +394,9 @@ display_top_tabs($tab_array, false, 'nav nav-tabs');
 						<td>
 <?php
 		if ($filterent['act'] == "block") {
-			$icon_act = "fa-times icon-danger";
+			$icon_act = "fa-times text-danger";
 		} else {
-			$icon_act = "fa-check icon-success";
+			$icon_act = "fa-check text-success";
 		}
 ?>
 							<i class="fa <?php echo $icon_act;?> icon-pointer" title="<?php echo $filterent['act'] .'/'. $filterent['tracker'];?>" onclick="javascript:getURL('status_logs_filter.php?getrulenum=<?="{$filterent['rulenum']},{$filterent['tracker']},{$filterent['act']}"; ?>', outputrule);"></i>
diff --git a/src/usr/local/www/widgets/widgets/log.widget.php b/src/usr/local/www/widgets/widgets/log.widget.php
index fb31aef..1d5874f 100644
--- a/src/usr/local/www/widgets/widgets/log.widget.php
+++ b/src/usr/local/www/widgets/widgets/log.widget.php
@@ -150,13 +150,13 @@ if (isset($_POST['lastsawtime'])) {
 		}
 
 		if ($filterent['act'] == "block") {
-			$iconfn = "times icon-danger";
+			$iconfn = "times text-danger";
 		} else if ($filterent['act'] == "reject") {
-			$iconfn = "hand-stop-o icon-warning";
+			$iconfn = "hand-stop-o text-warning";
 		} else if ($filterent['act'] == "match") {
 			$iconfn = "filter";
 		} else {
-			$iconfn = "check icon-success";
+			$iconfn = "check text-success";
 		}
 
 		$rule = find_rule_by_number($filterent['rulenum'], $filterent['tracker'], $filterent['act']);
-- 
cgit v1.1