diff options
| -rw-r--r-- | src/etc/inc/filter_log.inc | 2 | ||||
| -rw-r--r-- | src/etc/inc/service-utils.inc | 16 | ||||
| -rwxr-xr-x | src/usr/local/www/diag_logs_vpn.php | 4 | ||||
| -rw-r--r-- | src/usr/local/www/firewall_rules.php | 14 | ||||
| -rw-r--r-- | src/usr/local/www/guiconfig.inc | 2 | ||||
| -rwxr-xr-x | src/usr/local/www/head.inc | 2 | ||||
| -rwxr-xr-x | src/usr/local/www/pkg.php | 2 | ||||
| -rw-r--r-- | src/usr/local/www/shortcuts.inc | 6 | ||||
| -rw-r--r-- | src/usr/local/www/system_crlmanager.php | 2 | ||||
| -rw-r--r-- | src/usr/local/www/widgets/widgets/carp_status.widget.php | 10 | ||||
| -rw-r--r-- | src/usr/local/www/widgets/widgets/interfaces.widget.php | 16 | ||||
| -rw-r--r-- | src/usr/local/www/widgets/widgets/wake_on_lan.widget.php | 6 |
12 files changed, 41 insertions, 41 deletions
diff --git a/src/etc/inc/filter_log.inc b/src/etc/inc/filter_log.inc index 7151891..b46d672 100644 --- a/src/etc/inc/filter_log.inc +++ b/src/etc/inc/filter_log.inc @@ -409,7 +409,7 @@ function find_rule_by_number_buffer($rulenum, $trackernum, $type) { } else { $ruleString = $buffer_rules_normal[$lookup_key]; list(,$rulename,) = explode("\"", $ruleString); - $rulename = str_replace("USER_RULE: ", '<i class="icon-large icon-user"></i> ', $rulename); + $rulename = str_replace("USER_RULE: ", '<i class="fa fa-user"></i> ', $rulename); } return "{$rulename} ({$lookup_key})"; } diff --git a/src/etc/inc/service-utils.inc b/src/etc/inc/service-utils.inc index 265ad9f..4ec58bc 100644 --- a/src/etc/inc/service-utils.inc +++ b/src/etc/inc/service-utils.inc @@ -465,7 +465,7 @@ function get_service_status_icon($service, $withtext = true, $smallicon = false) if (get_service_status($service)) { $statustext = gettext("Running"); $output .= "<a title=\"" . sprintf(gettext("%s Service is"), $service["name"]) . " {$statustext}\" ><i class=\""; - $output .= ($smallicon) ? "icon icon-play" : "icon icon-large icon-play"; + $output .= ($smallicon) ? "fa fa-play" : "fa fa-lg fa-play"; $output .= "\" ></i></a>"; if ($withtext) { $output .= " " . $statustext; @@ -474,7 +474,7 @@ function get_service_status_icon($service, $withtext = true, $smallicon = false) $service_enabled = is_service_enabled($service['name']); $statustext = ($service_enabled) ? gettext("Stopped") : gettext("Disabled"); $output .= "<a title=\"" . sprintf(gettext("%s Service is"), $service["name"]) . " {$statustext}\" ><i class=\""; - $output .= ($smallicon) ? "icon icon-remove" : "icon icon-large icon-remove"; + $output .= ($smallicon) ? "fa fa-times" : "fa fa-lg fa-times"; $output .= "\" ></i></a>"; if ($withtext) { $output .= " " . $statustext; @@ -512,7 +512,7 @@ function get_service_control_GET_links($service, $addname = false) { default: $output .= "<a href='status_services.php?mode=restartservice&service={$service['name']}'>"; } - $output .= "<i class=\"icon-large icon-repeat\" title='" . sprintf(gettext("Restart %sService"), $stitle) . "' alt='restart'></i></a>\n"; + $output .= "<i class=\"fa fa-repeat\" title='" . sprintf(gettext("Restart %sService"), $stitle) . "' alt='restart'></i></a>\n"; switch ($service['name']) { case "openvpn": $output .= "<a href='status_services.php?mode=stopservice&service={$service['name']}&vpnmode={$service['mode']}&id={$service['vpnid']}'>"; @@ -523,13 +523,13 @@ function get_service_control_GET_links($service, $addname = false) { default: $output .= "<a href='status_services.php?mode=stopservice&service={$service['name']}'>"; } - $output .= "<i class=\"icon-large icon-stop\" title='" . sprintf(gettext("Stop %sService"), $stitle) . "' alt='stop'></i></a>"; + $output .= "<i class=\"fa fa-stop\" title='" . sprintf(gettext("Stop %sService"), $stitle) . "' alt='stop'></i></a>"; } else { $service_enabled = is_service_enabled($service['name']); if ($service['name'] == 'openvpn' || $service['name'] == 'captiveportal' || $service_enabled) { $output .= sprintf($link, sprintf(gettext("Start %sService"), $stitle), 'startservice'); - $output .= '<i class="icon icon-play-circle"></i></a> '; + $output .= '<i class="fa fa-play-circle"></i></a> '; } } @@ -564,7 +564,7 @@ function get_service_control_links($service, $addname = false) { $output .= '<a href="#" id="restartservice-' . $service['name'] . '" >'; } - $output .= "<i class=\"icon-large icon-repeat\" title='" . sprintf(gettext("Restart %sService"), $stitle) . "' alt='restart'></i></a>\n"; + $output .= "<i class=\"fa fa-repeat\" title='" . sprintf(gettext("Restart %sService"), $stitle) . "' alt='restart'></i></a>\n"; switch ($service['name']) { case "openvpn": @@ -577,14 +577,14 @@ function get_service_control_links($service, $addname = false) { $output .= '<a href="#" id="stopservice-' . $service['name'] . '">'; } - $output .= "<i class=\"icon-large icon-stop\" title='" . sprintf(gettext("Stop %sService"), $stitle) . "' alt='stop'></i></a>"; + $output .= "<i class=\"fa fa-stop\" title='" . sprintf(gettext("Stop %sService"), $stitle) . "' alt='stop'></i></a>"; } else { $service_enabled = is_service_enabled($service['name']); if ($service['name'] == 'openvpn' || $service['name'] == 'captiveportal' || $service_enabled) { $output .= sprintf($link, sprintf(gettext("Start %sService"), $stitle), 'startservice'); - $output .= '<i class="icon icon-play-circle"></i></a> '; + $output .= '<i class="fa fa-play-circle"></i></a> '; } } diff --git a/src/usr/local/www/diag_logs_vpn.php b/src/usr/local/www/diag_logs_vpn.php index 82e14b7..2f2cc7a 100755 --- a/src/usr/local/www/diag_logs_vpn.php +++ b/src/usr/local/www/diag_logs_vpn.php @@ -137,9 +137,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=\"icon-large icon-arrow-left\" alt=\"in\"></i></td>\n"; + echo "<td><i class=\"fa fa-arrow-left\" alt=\"in\"></i></td>\n"; } else { - echo "<td><i class=\"icon-large icon-arrow-right\" alt=\"out\"></i></td>\n"; + echo "<td><i class=\"fa fa-arrow-right\" alt=\"out\"></i></td>\n"; } echo "<td>" . htmlspecialchars($llent[3]) . "</td>\n"; diff --git a/src/usr/local/www/firewall_rules.php b/src/usr/local/www/firewall_rules.php index b3c5476..cd44330 100644 --- a/src/usr/local/www/firewall_rules.php +++ b/src/usr/local/www/firewall_rules.php @@ -377,7 +377,7 @@ for ($i = 0; isset($a_filter[$i]); $i++): <?php $isadvset = firewall_check_for_advanced_options($filterent); if ($isadvset) - print '<i class="icon icon-cog" title="'. gettext("advanced setting") .': '. $isadvset .'"></i>'; + print '<i class="fa fa-cog" title="'. gettext("advanced setting") .': '. $isadvset .'"></i>'; if (isset($filterent['log'])) print '<i class="icon icon-tasks" title="'. gettext("traffic is logged") .'"></i>'; @@ -508,18 +508,18 @@ for ($i = 0; isset($a_filter[$i]); $i++): if (!isset($filterent['disabled'])) { if ($schedstatus) { if ($iconfn == "block" || $iconfn == "reject") { - $image = "icon_block"; + $image = "times-circle"; $alttext = gettext("Traffic matching this rule is currently being denied"); } else { - $image = "icon_pass"; + $image = "play-circle"; $alttext = gettext("Traffic matching this rule is currently being allowed"); } $printicon = true; } else if ($filterent['sched']) { if ($iconfn == "block" || $iconfn == "reject") - $image = "icon_block_d"; + $image = "times-circle"; else - $image = "icon_block"; + $image = "times-circle"; $alttext = gettext("This rule is not currently active because its period has expired"); $printicon = true; } @@ -604,7 +604,7 @@ for ($i = 0; isset($a_filter[$i]); $i++): </td> <td> <?php if ($printicon) { ?> - <i class="icon-large <?=$image;?>" title="<?=$alttext;?>" alt="icon" /> + <i class="fa fa-<?=$image;?>" title="<?=$alttext;?>" alt="icon" /> <?php } ?> <?=$schedule_span_begin;?><?=htmlspecialchars($filterent['sched']);?> <?=$schedule_span_end;?> </td> @@ -679,7 +679,7 @@ for ($i = 0; isset($a_filter[$i]); $i++): <dt><i class="icon icon-remove"></i></dt> <dd><?=gettext("Block");?></dd> <dt><i class="icon icon-fire"></i></dt> <dd><?=gettext("Reject");?></dd> <dt><i class="icon icon-tasks"></i></dt> <dd> <?=gettext("Log");?></dd> - <dt><i class="icon icon-cog"></i></dt> <dd> <?=gettext("Advanced filter");?></dd> + <dt><i class="fa fa-cog"></i></dt> <dd> <?=gettext("Advanced filter");?></dd> </dl> <?php diff --git a/src/usr/local/www/guiconfig.inc b/src/usr/local/www/guiconfig.inc index 8273859..3d0e2fc 100644 --- a/src/usr/local/www/guiconfig.inc +++ b/src/usr/local/www/guiconfig.inc @@ -367,7 +367,7 @@ function print_info_box_np_undo($msg, $name = "apply", $value = "Apply changes", <table class="infoboxnptable2" summary="message"> <tr> <td class="infoboxnptd"> - <i class="icon-large icon-exclamation-sign"></i> + <i class="fa fa-exclamation-circle"></i> </td> <td class="infoboxnptd2"> <b>{$msg}</b> diff --git a/src/usr/local/www/head.inc b/src/usr/local/www/head.inc index 3fd1a62..4b8cd69 100755 --- a/src/usr/local/www/head.inc +++ b/src/usr/local/www/head.inc @@ -469,7 +469,7 @@ echo '<li>'. get_shortcut_log_link($shortcut_section, false). '</li>'; <?php if (!$g['disablehelpicon']): ?> <li> <a href="<?=$helpurl?>" title="<?=gettext("Help for items on this page")?>" class="help-icon"> - <i class="icon-large icon-question-sign"></i> + <i class="fa fa-question-circle"></i> </a> </li> <?php endif?> diff --git a/src/usr/local/www/pkg.php b/src/usr/local/www/pkg.php index ce067ea..72787d6 100755 --- a/src/usr/local/www/pkg.php +++ b/src/usr/local/www/pkg.php @@ -566,7 +566,7 @@ if ($savemsg) if ($pkg['adddeleteeditpagefields']['description']) { ?> <td> - <i class="icon-large icon-info-sign"><?=$pkg['adddeleteeditpagefields']['description']?></i> + <i class="fa fa-info-circle"><?=$pkg['adddeleteeditpagefields']['description']?></i> </td> <?php } diff --git a/src/usr/local/www/shortcuts.inc b/src/usr/local/www/shortcuts.inc index 39fe036..ff026e2 100644 --- a/src/usr/local/www/shortcuts.inc +++ b/src/usr/local/www/shortcuts.inc @@ -124,7 +124,7 @@ function get_shortcut_main_link($shortcut_section, $addspace = true, $service = break; } if (!empty($link) && ($_SERVER['REQUEST_URI'] != "/{$link}")) { - return "{$space}<a href=\"{$link}\" title=\"" . gettext("Main page for this section") . "\"><i class=\"icon-large icon-plus-sign\"></i></a>"; + return "{$space}<a href=\"{$link}\" title=\"" . gettext("Main page for this section") . "\"><i class=\"fa fa-plus-circle\"></i></a>"; } } @@ -152,7 +152,7 @@ function get_shortcut_status_link($shortcut_section, $addspace = true, $service break; } if (!empty($link)) { - return "{$space}<a href=\"{$link}\" title=\"" . gettext("Status of items on this page") . "\"><i class=\"icon-large icon-cog\"></i></a>"; + return "{$space}<a href=\"{$link}\" title=\"" . gettext("Status of items on this page") . "\"><i class=\"fa fa-cog\"></i></a>"; } } @@ -160,7 +160,7 @@ function get_shortcut_log_link($shortcut_section, $addspace = true) { global $g, $shortcuts; $space = ($addspace) ? " " : "" ; if (!empty($shortcut_section) && !empty($shortcuts[$shortcut_section]['log'])) { - return "{$space}<a href=\"{$shortcuts[$shortcut_section]['log']}\" title=\"" . gettext("Log entries for items on this page") . "\"><i class=\"icon-large icon-list-alt\"></i></a>"; + return "{$space}<a href=\"{$shortcuts[$shortcut_section]['log']}\" title=\"" . gettext("Log entries for items on this page") . "\"><i class=\"fa fa-list-alt\"></i></a>"; } } diff --git a/src/usr/local/www/system_crlmanager.php b/src/usr/local/www/system_crlmanager.php index 8317ab5..8dbf2aa 100644 --- a/src/usr/local/www/system_crlmanager.php +++ b/src/usr/local/www/system_crlmanager.php @@ -524,7 +524,7 @@ if ($act == "new" || $act == gettext("Save") || $input_errors) { </td> <td class="list"> <a href="system_crlmanager.php?act=delcert&id=<?=$crl['refid']; ?>&certref=<?=$cert['refid']; ?>" onclick="return confirm('<?=gettext("Do you really want to delete this Certificate from the CRL?")?>')"> - <i class="icon-large icon-remove-sign" title="<?=gettext("Delete this certificate from the CRL ")?>" alt="<?=gettext("Delete this certificate from the CRL ")?>"></i> + <i class="fa fa-times-circle" title="<?=gettext("Delete this certificate from the CRL ")?>" alt="<?=gettext("Delete this certificate from the CRL ")?>"></i> </a> </td> </tr> diff --git a/src/usr/local/www/widgets/widgets/carp_status.widget.php b/src/usr/local/www/widgets/widgets/carp_status.widget.php index 953350c..642b0f4 100644 --- a/src/usr/local/www/widgets/widgets/carp_status.widget.php +++ b/src/usr/local/www/widgets/widgets/carp_status.widget.php @@ -82,7 +82,7 @@ $carp_enabled = get_carp_status(); ?> <tr> <td> - <i class="icon icon-inbox"></i> + <i class="fa fa-inbox"></i> <a href="/system_hasync.php"> <?=htmlspecialchars(convert_friendly_interface_to_friendly_descr($carp['interface']) . "@{$vhid}");?> </a> @@ -91,14 +91,14 @@ $carp_enabled = get_carp_status(); <?php if ($carp_enabled == false) { $status = "DISABLED"; - echo '<i class="icon-large icon-ban-circle"></i>'; + echo '<i class="fa fa-ban"></i>'; } else { if($status == "MASTER") { - echo '<i class="icon-large icon-arrow-right"></i>'; + echo '<i class="fa fa-arrow-right"></i>'; } else if($status == "BACKUP") { - echo '<i class="icon-large icon-arrow-right"></i>'; + echo '<i class="fa fa-arrow-right"></i>'; } else if($status == "INIT") { - echo '<i class="icon-large icon-list-alt"></i>'; + echo '<i class="fa fa-list-alt"></i>'; } } if ($ipaddress){ ?> diff --git a/src/usr/local/www/widgets/widgets/interfaces.widget.php b/src/usr/local/www/widgets/widgets/interfaces.widget.php index bffc35d..eee7cdd 100644 --- a/src/usr/local/www/widgets/widgets/interfaces.widget.php +++ b/src/usr/local/www/widgets/widgets/interfaces.widget.php @@ -70,22 +70,22 @@ foreach ($ifdescrs as $ifdescr => $ifname): $ifinfo = get_interface_info($ifdescr); if ($ifinfo['ppplink']) { - $icon = 'icon-headphones'; + $icon = 'headphones'; } else if (is_interface_wireless($ifdescr)) { - $icon = 'icon-signal'; + $icon = 'signal'; } else { - $icon = 'icon-cog'; + $icon = 'cog'; } $known_status = true; // Choose an icon by interface status if ($ifinfo['status'] == "up" || $ifinfo['status'] == "associated") { - $icon = 'icon-arrow-up'; + $icon = 'arrow-up'; } elseif ($ifinfo['status'] == "no carrier") { - $icon = 'icon-remove'; + $icon = 'times-circle'; } elseif ($ifinfo['status'] == "down") { - $icon = 'icon-arrow-up'; + $icon = 'arrow-up'; } else { $known_status = false; } @@ -93,14 +93,14 @@ foreach ($ifdescrs as $ifdescr => $ifname): ?> <tr> <td title="<?=htmlspecialchars($ifinfo['macaddr'])?>"> - <i class="icon icon-<?=$icon?>"></i> + <i class="fa fa-<?=$icon?>"></i> <a href="/interfaces.php?if=<?=$ifdescr?>"> <?=htmlspecialchars($ifname);?> </a> </td> <td> <?php if ($known_status):?> - <i class="icon <?=$icon?>" alt="<?=htmlspecialchars($ifinfo['status'])?>"></i> + <i class="fa fa-<?=$icon?>" alt="<?=htmlspecialchars($ifinfo['status'])?>"></i> <?php else: ?> <?=htmlspecialchars($ifinfo['status'])?> <?php endif; ?> 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 340193d..27f983d 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 @@ -88,13 +88,13 @@ if (count($wolcomputers) > 0) { echo "<td>\n"; if ($status == 'expires') { - echo '<i class="icon-large icon-arrow-right" data-toggle="tooltip" title="' . gettext("Online") . '"></i>'; + echo '<i class="fa fa-arrow-right" data-toggle="tooltip" title="' . gettext("Online") . '"></i>'; } else if ($status == 'permanent') { echo '<td align="center">' . "\n"; - echo '<i class="icon-large icon-arrow-right" data-toggle="tooltip" title="' . gettext("Static ARP") . '"></i>'; + echo '<i class="fa fa-arrow-right" data-toggle="tooltip" title="' . gettext("Static ARP") . '"></i>'; } else { echo '<td" align="center">' . "\n"; - echo '<i class="icon-large icon-ban-circle" data-toggle="tooltip" title="' . gettext("Offline") . '"></i>'; + echo '<i class="fa fa-ban" data-toggle="tooltip" title="' . gettext("Offline") . '"></i>'; } echo "</td>\n<td>"; |
