diff options
author | Stephen Beaver <sbeaver@netgate.com> | 2015-11-02 09:12:02 -0500 |
---|---|---|
committer | Stephen Beaver <sbeaver@netgate.com> | 2015-11-02 09:12:02 -0500 |
commit | 0c499bef7ff435ee9b6a6bff0b005e0e94d87834 (patch) | |
tree | 05f96fe5ee192dd98f4c6a57792df3ba7b695b3c /src/usr/local/www | |
parent | b38e4b6c6fa3d24af1ca0a7afdcb8266cacaedaa (diff) | |
download | pfsense-0c499bef7ff435ee9b6a6bff0b005e0e94d87834.zip pfsense-0c499bef7ff435ee9b6a6bff0b005e0e94d87834.tar.gz |
Make diag_logs_filter and diag_logs_filter_dynamic consistent by moving action icon to last column
Diffstat (limited to 'src/usr/local/www')
-rw-r--r-- | src/usr/local/www/diag_logs_filter.php | 43 | ||||
-rwxr-xr-x | src/usr/local/www/diag_logs_filter_dynamic.php | 18 |
2 files changed, 32 insertions, 29 deletions
diff --git a/src/usr/local/www/diag_logs_filter.php b/src/usr/local/www/diag_logs_filter.php index d9f1308..2cf0ec9 100644 --- a/src/usr/local/www/diag_logs_filter.php +++ b/src/usr/local/www/diag_logs_filter.php @@ -367,7 +367,6 @@ if (!isset($config['syslog']['rawfilter'])) { <div class="table-responsive"> <table class="table table striped table-hover table-compact"> <tr> - <th><?=gettext("Act")?></th> <th><?=gettext("Time")?></th> <th><?=gettext("IF")?></th> <?php @@ -382,6 +381,7 @@ if (!isset($config['syslog']['rawfilter'])) { <th><?=gettext("Source")?></th> <th><?=gettext("Destination")?></th> <th><?=gettext("Proto")?></th> + <th><?=gettext("Act")?></th> </tr> <?php if ($config['syslog']['filterdescriptions']) @@ -391,24 +391,6 @@ if (!isset($config['syslog']['rawfilter'])) { ?> <tr> <td> -<?php - if ($filterent['act'] == "block") { -?> - <i class="fa fa-times icon-danger icon-pointer" title="<?php echo $filterent['act'] .'/'. $filterent['tracker'];?>" onclick="javascript:getURL('diag_logs_filter.php?getrulenum=<?="{$filterent['rulenum']},{$filterent['tracker']},{$filterent['act']}"; ?>', outputrule);"></i> -<?php - } - else { -?> - <i class="fa fa-check icon-success icon-pointer" title="<?php echo $filterent['act'] .'/'. $filterent['tracker'];?>" onclick="javascript:getURL('diag_logs_filter.php?getrulenum=<?="{$filterent['rulenum']},{$filterent['tracker']},{$filterent['act']}"; ?>', outputrule);"></i> -<?php - } -?> -<?php - if ($filterent['count']) - echo $filterent['count']; -?> - </td> - <td> <?=htmlspecialchars($filterent['time'])?> </td> <td> @@ -464,7 +446,28 @@ if (!isset($config['syslog']['rawfilter'])) { if ($filterent['proto'] == "TCP") $filterent['proto'] .= ":{$filterent['tcpflags']}"; ?> - <td><?=htmlspecialchars($filterent['proto'])?></td> + <td> + <?=htmlspecialchars($filterent['proto'])?> + </td> + + <td> +<?php + if ($filterent['act'] == "block") { +?> + <i class="fa fa-times icon-danger icon-pointer" title="<?php echo $filterent['act'] .'/'. $filterent['tracker'];?>" onclick="javascript:getURL('diag_logs_filter.php?getrulenum=<?="{$filterent['rulenum']},{$filterent['tracker']},{$filterent['act']}"; ?>', outputrule);"></i> +<?php + } + else { +?> + <i class="fa fa-check icon-success icon-pointer" title="<?php echo $filterent['act'] .'/'. $filterent['tracker'];?>" onclick="javascript:getURL('diag_logs_filter.php?getrulenum=<?="{$filterent['rulenum']},{$filterent['tracker']},{$filterent['act']}"; ?>', outputrule);"></i> +<?php + } +?> +<?php + if ($filterent['count']) + echo $filterent['count']; +?> + </td> </tr> <?php if (isset($config['syslog']['filterdescriptions']) && $config['syslog']['filterdescriptions'] === "2") { diff --git a/src/usr/local/www/diag_logs_filter_dynamic.php b/src/usr/local/www/diag_logs_filter_dynamic.php index 4a8b42b..c22144c 100755 --- a/src/usr/local/www/diag_logs_filter_dynamic.php +++ b/src/usr/local/www/diag_logs_filter_dynamic.php @@ -4,11 +4,11 @@ diag_logs_filter_dynamic.php */ /* ==================================================================== - * Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved. + * Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved. * Copyright (c) 2004, 2005 Scott Ullrich * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: + * Redistribution and use in source and binary forms, with or without modification, + * are permitted provided that the following conditions are met: * * 1. Redistributions of source code must retain the above copyright notice, * this list of conditions and the following disclaimer. @@ -16,12 +16,12 @@ * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in * the documentation and/or other materials provided with the - * distribution. + * distribution. * - * 3. All advertising materials mentioning features or use of this software + * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgment: * "This product includes software developed by the pfSense Project - * for use in the pfSense software distribution. (http://www.pfsense.org/). + * for use in the pfSense software distribution. (http://www.pfsense.org/). * * 4. The names "pfSense" and "pfSense Project" must not be used to * endorse or promote products derived from this software without @@ -178,7 +178,7 @@ display_top_tabs($tab_array, false, 'nav nav-tabs'); <th><?=gettext("Source")?></th> <th><?=gettext("Destination")?></th> <th><?=gettext("Proto")?></th> - <th></th> <!-- For the "Block" buttons--> + <th><?=gettext("Act")?></th> <!-- For the "Block" buttons--> </tr> </thead> <tbody id="filter-log-entries"> @@ -225,11 +225,11 @@ display_top_tabs($tab_array, false, 'nav nav-tabs'); ?> <i class="fa fa-times icon-danger icon-pointer" title="<?php echo $filterent['act'] .'/'. $filterent['tracker'];?>" onclick="javascript:getURL('diag_logs_filter.php?getrulenum=<?="{$filterent['rulenum']},{$filterent['tracker']},{$filterent['act']}"; ?>', outputrule);"></i> <?php - } + } else { ?> <i class="fa fa-check icon-success icon-pointer" title="<?php echo $filterent['act'] .'/'. $filterent['tracker'];?>" onclick="javascript:getURL('diag_logs_filter.php?getrulenum=<?="{$filterent['rulenum']},{$filterent['tracker']},{$filterent['act']}"; ?>', outputrule);"></i> -<?php +<?php } ?> |