diff options
author | Stephen Beaver <sbeaver@netgate.com> | 2015-11-02 09:04:25 -0500 |
---|---|---|
committer | Stephen Beaver <sbeaver@netgate.com> | 2015-11-02 09:04:25 -0500 |
commit | b38e4b6c6fa3d24af1ca0a7afdcb8266cacaedaa (patch) | |
tree | b353d4d06ee9b3994f9697e67338e0adc4ec5a5f /src/usr/local/www | |
parent | 0e445ef7fdebc948e4009a567d30bf7a8f76d913 (diff) | |
download | pfsense-b38e4b6c6fa3d24af1ca0a7afdcb8266cacaedaa.zip pfsense-b38e4b6c6fa3d24af1ca0a7afdcb8266cacaedaa.tar.gz |
Changed icons to font-awesome
Changed tooltips to Bootstrap style
Diffstat (limited to 'src/usr/local/www')
-rw-r--r-- | src/usr/local/www/bootstrap/css/pfSense.css | 6 | ||||
-rw-r--r-- | src/usr/local/www/diag_logs_filter.php | 14 | ||||
-rwxr-xr-x | src/usr/local/www/diag_logs_filter_dynamic.php | 10 |
3 files changed, 24 insertions, 6 deletions
diff --git a/src/usr/local/www/bootstrap/css/pfSense.css b/src/usr/local/www/bootstrap/css/pfSense.css index cb8ea78..e06524f 100644 --- a/src/usr/local/www/bootstrap/css/pfSense.css +++ b/src/usr/local/www/bootstrap/css/pfSense.css @@ -309,8 +309,12 @@ form .btn + .btn { color: #5CB85C; } +.icon-primary +{ + color: #337AB7; +} +/** icons are often used with onclick actions, so we need the cursor to change to a pointer */ .icon-pointer { cursor: pointer; - cursor: hand; }
\ No newline at end of file diff --git a/src/usr/local/www/diag_logs_filter.php b/src/usr/local/www/diag_logs_filter.php index b87a4c8..d9f1308 100644 --- a/src/usr/local/www/diag_logs_filter.php +++ b/src/usr/local/www/diag_logs_filter.php @@ -444,19 +444,19 @@ if (!isset($config['syslog']['rawfilter'])) { $dst_htmlclass = str_replace(array('.', ':'), '-', $filterent['dstip']); ?> <td> - <i class="icon icon-map-marker" onclick="javascript:resolve_with_ajax('<?="{$filterent['srcip']}"; ?>');" title="<?=gettext("Click to resolve")?>" alt="Reverse Resolve with DNS"/> + <i class="fa fa-info icon-pointer icon-primary" onclick="javascript:resolve_with_ajax('<?="{$filterent['srcip']}"; ?>');" title="<?=gettext("Click to resolve")?>" alt="Reverse Resolve with DNS"/> </i> - <i class="icon icon-download" href="easyrule.php?<?="action=block&int={$int}&src={$filterent['srcip']}&ipproto={$ipproto}"; ?>" alt="Easy Rule: Add to Block List" title="<?=gettext("Easy Rule: Add to Block List")?>" onclick="return confirm('<?=gettext("Do you really want to add this BLOCK rule?")?>')"> + <i class="fa fa-minus-square-o icon-pointer icon-primary" href="easyrule.php?<?="action=block&int={$int}&src={$filterent['srcip']}&ipproto={$ipproto}"; ?>" alt="Easy Rule: Add to Block List" title="<?=gettext("Easy Rule: Add to Block List")?>" onclick="return confirm('<?=gettext("Do you really want to add this BLOCK rule?")?>')"> </i> <?=$srcstr . '<span class="RESOLVE-' . $src_htmlclass . '"></span>'?> </td> <td> - <i class="icon icon-map-marker" onclick="javascript:resolve_with_ajax('<?="{$filterent['dstip']}"; ?>');" title="<?=gettext("Click to resolve")?>" class="ICON-<?= $dst_htmlclass; ?>" alt="Reverse Resolve with DNS"/> + <i class="fa fa-info icon-pointer icon-primary" onclick="javascript:resolve_with_ajax('<?="{$filterent['dstip']}"; ?>');" title="<?=gettext("Click to resolve")?>" class="ICON-<?= $dst_htmlclass; ?>" alt="Reverse Resolve with DNS"/> </i> - <i class="icon icon-upload" href="easyrule.php?<?="action=pass&int={$int}&proto={$proto}&src={$filterent['srcip']}&dst={$filterent['dstip']}&dstport={$filterent['dstport']}&ipproto={$ipproto}"; ?>" title="<?=gettext("Easy Rule: Pass this traffic")?>" onclick="return confirm('<?=gettext("Do you really want to add this PASS rule?")?>')"> + <i class="fa fa-plus-square-o icon-pointer icon-primary" href="easyrule.php?<?="action=pass&int={$int}&proto={$proto}&src={$filterent['srcip']}&dst={$filterent['dstip']}&dstport={$filterent['dstport']}&ipproto={$ipproto}"; ?>" title="<?=gettext("Easy Rule: Pass this traffic")?>" onclick="return confirm('<?=gettext("Do you really want to add this PASS rule?")?>')"> </i> <?=$dststr . '<span class="RESOLVE-' . $dst_htmlclass . '"></span>'?> </td> @@ -508,7 +508,7 @@ else print_info_box('<a href="https://doc.pfsense.org/index.php/What_are_TCP_Flags%3F">' . gettext("TCP Flags") . '</a>: F - FIN, S - SYN, A or . - ACK, R - RST, P - PSH, U - URG, E - ECE, C - CWR' . '<br />' . - '<i class="icon icon-download"></i> = Add to block list., <i class="icon icon-upload"></i> = Pass traffic, <i class="icon icon-map-marker"></i> = Resolve'); + '<i class="fa fa-minus-square-o icon-primary"></i> = Add to block list., <i class="fa fa-plus-square-o icon-primary"></i> = Pass traffic, <i class="fa fa-info icon-primary"></i> = Resolve'); ?> @@ -592,5 +592,9 @@ if (typeof getURL == 'undefined') { }; } +$(document).ready(function(){ + $('.fa').tooltip(); +}); + //]]> </script> diff --git a/src/usr/local/www/diag_logs_filter_dynamic.php b/src/usr/local/www/diag_logs_filter_dynamic.php index f9cc657..4a8b42b 100755 --- a/src/usr/local/www/diag_logs_filter_dynamic.php +++ b/src/usr/local/www/diag_logs_filter_dynamic.php @@ -250,4 +250,14 @@ if ($tcpcnt > 0) gettext("TCP Flags") . '</a>: F - FIN, S - SYN, A or . - ACK, R - RST, P - PSH, U - URG, E - ECE, C - CWR'); ?> +<script type="text/javascript"> +//<![CDATA[ +events.push(function(){ + $(document).ready(function(){ + $('.fa').tooltip(); + }); +}); +//]]> +</script> + <?php include("foot.inc"); |