summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhil Davis <phil.davis@inf.org>2016-05-15 14:55:21 +0930
committerStephen Beaver <sbeaver@netgate.com>2016-05-16 07:40:15 -0400
commitd72312efd86ecfceb0d5526c7f11940817120e4b (patch)
treed721be1b0d0dfd08d43f641e805a74e97a956780
parent170fbb18b7bb89eb258cf8ee54c38f9b8125cf09 (diff)
downloadpfsense-d72312efd86ecfceb0d5526c7f11940817120e4b.zip
pfsense-d72312efd86ecfceb0d5526c7f11940817120e4b.tar.gz
Make limiters info box work same as By Interface
The info box displayed on Firewall->Shaper, By Interface come down the bottom with and info icon and can be shown/hidden by the user. The similar info box on Firewall->Shaper, Limiters sits in the main body with no info icon and cannot be shown/hidden, but can be dismissed. Make the info box on Firewall->Shaper, Limiters dispaly and owrk the same as on "By Interface". (cherry picked from commit a79dfdaa431d4f647fbcbaf63a5c55f081b2edc2)
-rw-r--r--src/usr/local/www/firewall_shaper_vinterface.php16
1 files changed, 12 insertions, 4 deletions
diff --git a/src/usr/local/www/firewall_shaper_vinterface.php b/src/usr/local/www/firewall_shaper_vinterface.php
index 3a8f793..6a87e75 100644
--- a/src/usr/local/www/firewall_shaper_vinterface.php
+++ b/src/usr/local/www/firewall_shaper_vinterface.php
@@ -432,9 +432,7 @@ display_top_tabs($tab_array);
<td>
<?php
-if ($dfltmsg) {
- print_info_box($dn_default_shaper_msg, 'info');
-} else {
+if (!$dfltmsg) {
// Add global buttons
if (!$dontshow || $newqueue) {
if ($can_add && ($action != "add")) {
@@ -481,7 +479,17 @@ if ($dfltmsg) {
</tbody>
</table>
</div>
-
+<?php
+if ($dfltmsg) {
+?>
+<div>
+ <div class="infoblock">
+ <?php print_info_box($dn_default_shaper_msg, 'info', false); ?>
+ </div>
+</div>
+<?php
+}
+?>
<script type="text/javascript">
//<![CDATA[
events.push(function() {
OpenPOWER on IntegriCloud