summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorStephen Beaver <sbeaver@netgate.com>2015-11-04 11:01:39 -0500
committerStephen Beaver <sbeaver@netgate.com>2015-11-04 11:02:05 -0500
commit0149ef4d2b3f8f714f57ef4a39cf5c4c126e7eef (patch)
tree4230b3ec2792f2b0b182e3b6b3bfddfc21fc8e08 /src
parentb2971431511c162e350e614b6d8f4b3aa3954f0c (diff)
downloadpfsense-0149ef4d2b3f8f714f57ef4a39cf5c4c126e7eef.zip
pfsense-0149ef4d2b3f8f714f57ef4a39cf5c4c126e7eef.tar.gz
AUtomatically add "info" icon where required
Diffstat (limited to 'src')
-rw-r--r--src/usr/local/www/firewall_aliases.php1
-rw-r--r--src/usr/local/www/firewall_nat.php15
-rw-r--r--src/usr/local/www/jquery/pfSenseHelpers.js6
3 files changed, 18 insertions, 4 deletions
diff --git a/src/usr/local/www/firewall_aliases.php b/src/usr/local/www/firewall_aliases.php
index 5461708..8a71e98 100644
--- a/src/usr/local/www/firewall_aliases.php
+++ b/src/usr/local/www/firewall_aliases.php
@@ -291,7 +291,6 @@ display_top_tabs($tab_array);
<!-- Information section. Icon ID must be "showinfo" and the information <div> ID must be "infoblock".
That way jQuery (in pfenseHelpers.js) will automatically take care of the display. -->
<div>
-<i class="fa fa-info-circle icon-pointer" style="color: #337AB7;; font-size:20px; margin-left: 10px; margin-bottom: 10px;" id="showinfo" title="<?=gettext('More information')?>"></i>
<div id="infoblock">
<?=print_info_box(gettext( 'Aliases act as placeholders for real hosts, networks or ports. They can be used to minimize the number ' .
'of changes that have to be made if a host, network or port changes. <br />' .
diff --git a/src/usr/local/www/firewall_nat.php b/src/usr/local/www/firewall_nat.php
index 87af5c2..8372b09 100644
--- a/src/usr/local/www/firewall_nat.php
+++ b/src/usr/local/www/firewall_nat.php
@@ -368,9 +368,18 @@ endforeach;
</div>
<div class="pull-right">
- <a href="firewall_nat_edit.php?after=-1" class="btn btn-sm btn-success" title="<?=gettext('Add new rule')?>"><?=gettext('Add new rule')?></a>
- <input name="del_x" type="submit" class="btn btn-danger btn-sm" value="<?=gettext("Delete selected rules"); ?>" />
- <input type="submit" id="order-store" name="order-store" class="btn btn-primary btn-sm" value="<?=gettext("Save changes")?>" disabled="disabled" />
+ <a href="firewall_nat_edit.php?after=-1" class="btn btn-sm btn-success" title="<?=gettext('Add new rule')?>">
+ <i class="fa fa-plus" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+ <?=gettext('Add')?>
+ </a>
+ <button name="del_x" type="submit" class="btn btn-danger btn-sm">
+ <i class="fa fa-trash" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+ <?=gettext("Delete"); ?>
+ </button>
+ <button type="submit" id="order-store" name="order-store" class="btn btn-primary btn-sm" disabled="disabled">
+ <i class="fa fa-save" style="font-size:15px; vertical-align: middle; margin-right: 6px;"></i>
+ <?=gettext("Save")?>
+ </button>
</div>
</form>
diff --git a/src/usr/local/www/jquery/pfSenseHelpers.js b/src/usr/local/www/jquery/pfSenseHelpers.js
index 0528c02..6c6e3fa 100644
--- a/src/usr/local/www/jquery/pfSenseHelpers.js
+++ b/src/usr/local/www/jquery/pfSenseHelpers.js
@@ -366,6 +366,12 @@ $('[id^=delete]').click(function(event) {
});
// "More information" handlers
+
+// If there is an infoblock, automatically add an info icon that toggles its display
+if($('#infoblock').length != 0) {
+ $('#infoblock').before('<i class="fa fa-info-circle icon-pointer" style="color: #337AB7;; font-size:20px; margin-left: 10px; margin-bottom: 10px;" id="showinfo" title="More information"></i>');
+}
+
// Hide information on page load
$('#infoblock').hide();
OpenPOWER on IntegriCloud