summaryrefslogtreecommitdiffstats
path: root/src/usr/local/www
diff options
context:
space:
mode:
authorStephen Beaver <sbeaver@netgate.com>2016-01-28 08:42:51 -0500
committerStephen Beaver <sbeaver@netgate.com>2016-01-28 08:43:19 -0500
commit0c61e4972809dfa6228d074534f5093ea7875e4f (patch)
tree91f51876c417b6f6be8e8bda18c8e501a4c0d5eb /src/usr/local/www
parentfc9795b54db05403a06c1eef04cc95135d0a37c8 (diff)
downloadpfsense-0c61e4972809dfa6228d074534f5093ea7875e4f.zip
pfsense-0c61e4972809dfa6228d074534f5093ea7875e4f.tar.gz
Cosetic update - Part 1
Diffstat (limited to 'src/usr/local/www')
-rw-r--r--src/usr/local/www/firewall_rules.php12
1 files changed, 7 insertions, 5 deletions
diff --git a/src/usr/local/www/firewall_rules.php b/src/usr/local/www/firewall_rules.php
index 04d9ee7..0e1e550 100644
--- a/src/usr/local/www/firewall_rules.php
+++ b/src/usr/local/www/firewall_rules.php
@@ -419,11 +419,11 @@ $rulescnt = pfSense_get_pf_rules();
<?php endif;?>
<?php if ($showblockbogons): ?>
<tr id="frrfc1918">
- <td></td>
+ <td></td>
<td title="<?=gettext("traffic is blocked")?>"><i class="fa fa-times text-danger"></i></td>
<td><? print_states(intval(BOGONS_TRACKER)); ?></td>
<td>*</td>
- <td><?=gettext("Reserved/not assigned by IANA");?></td>
+ <td><?=sprintf(gettext("Reserved%sNot assigned by IANA"), "<br />");?></td>
<td>*</td>
<td>*</td>
<td>*</td>
@@ -446,7 +446,7 @@ $seps = 0;
// There can be a separator before any rules are listed
if ($config['filter']['separator'][strtolower($if)]['sep0']['row'][0] == "fr-1") {
print('<tr class="ui-sortable-handle separator">' .
- '<td bgcolor="#cce5ff" colspan="11">' . '<font color="#002699">' . $config['filter']['separator'][strtolower($if)]['sep0']['text'] . '</font></td>' .
+ '<td bgcolor="#cce5ff" colspan="12">' . '<font color="#002699">' . $config['filter']['separator'][strtolower($if)]['sep0']['text'] . '</font></td>' .
'<td bgcolor="#cce5ff"><a href="#"><i class="fa fa-trash no-confirm sepdel" title="delete this separator"></i></a></td>' .
'</tr>' . "\n");
}
@@ -890,9 +890,11 @@ events.push(function() {
gColor = 'bg-info';
// Inset a temporary bar in which the user can enter some optional text
+ sepcols = $( "#ruletable tr td" ).length - 1;
+
$('#ruletable > tbody:last').append('<tr>' +
- '<td class="' + gColor + '" colspan="10"><input id="newsep" placeholder="<?=gettext("Enter a description, Save, then drag to final location.")?>" class="col-md-12" type="text" /></td>' +
- '<td class="' + gColor + '" colspan="2"><button class="btn btn-default btn-sm" id="btnnewsep"><?=gettext("Save")?></button>' +
+ '<td class="' + gColor + '" colspan="' + sepcols + '"><input id="newsep" placeholder="<?=gettext("Enter a description, Save, then drag to final location.")?>" class="col-md-12" type="text" /></td>' +
+ '<td class="' + gColor + '"><button class="btn btn-default btn-sm" id="btnnewsep"><?=gettext("Save")?></button>' +
'<button class="btn btn-default btn-sm" id="btncncsep"><?=gettext("Cancel")?></button>' +
'&nbsp;&nbsp;&nbsp;&nbsp;' +
'&nbsp;&nbsp;<a href="#" id="sepclrblue" value="bg-info"><i class="fa fa-circle text-info"></i></a>' +
OpenPOWER on IntegriCloud