diff options
| -rw-r--r-- | etc/inc/shaper.inc | 18 | ||||
| -rwxr-xr-x | usr/local/www/firewall_shaper.php | 11 |
2 files changed, 14 insertions, 15 deletions
diff --git a/etc/inc/shaper.inc b/etc/inc/shaper.inc index 3f1849e..fe364e5 100644 --- a/etc/inc/shaper.inc +++ b/etc/inc/shaper.inc @@ -544,7 +544,7 @@ class altq_root_queue { $form .= "./themes/".$g['theme']."/images/icons/icon_x.gif\""; $form .= " width=\"17\" height=\"17\" border=\"0\" title=\"Disable shaper on i nterface\">"; - $form .= "<span>Disable shaper from interface</span></a></td></tr>"; + $form .= "<span>Disable shaper on interface</span></a></td></tr>"; return $form; @@ -812,7 +812,7 @@ function GetEcn() { global $config; $mylink = &get_reference_to_me_in_config($this->GetLink()); - $copylink = &get_reference_to_me_in_config($queue->GetLink()); + $link = &get_reference_to_me_in_config($queue->GetLink()); if ($link && $mylink) { if (!is_array($mylink['queue'][$queue->GetQname()])) @@ -2175,19 +2175,19 @@ function build_iface_without_this_queue($iface, $qname) { $form .= $iface . "&queue=". $qname . "&action=add\">"; $form .= "<img src=\""; $form .= "./themes/".$g['theme']."/images/icons/icon_plus.gif\""; - $form .= " width=\"17\" height=\"17\" border=\"0\" title=\"Activate queue on this interface\">"; - $form .= " Activate queue on this interface</a></td></tr>"; + $form .= " width=\"17\" height=\"17\" border=\"0\" title=\"Clone shaper/queue on this interface\">"; + $form .= " Clone shaper/queue on this interface</a></td></tr>"; return $form; } -$default_shaper_msg = "<tr><td width=\"80%\" >"; -$default_shaper_msg .= "<strong>Welcome to the pfSense Traffic Shaper."; -$default_shaper_msg .= "The tree on the left helps you navigate through the"; -$default_shaper_msg .= "queues while the buttons at the bottom, which show actions, are activated accordingly"; -$default_shaper_ms .= " as allowed</strong>"; +$default_shaper_msg = "<tr><td align=\"center\" width=\"80%\" >"; +$default_shaper_msg .= "<span class=\"vexpl\"><strong><p><b>Welcome to the pfSense Traffic Shaper.</b><br />"; +$default_shaper_msg .= "The tree on the left helps you navigate through the queues <br />"; +$default_shaper_msg .= "buttons at the bottom represent queue actions and are activated accordingly."; +$default_shaper_ms .= " </p></strong></span>"; $default_shaper_msg .= "</td></tr>"; ?> diff --git a/usr/local/www/firewall_shaper.php b/usr/local/www/firewall_shaper.php index c8ef43c..e3e88f5 100755 --- a/usr/local/www/firewall_shaper.php +++ b/usr/local/www/firewall_shaper.php @@ -297,9 +297,8 @@ if ($queue) { $can_enable = true; else $can_enable = false; - if ($queue->CanHaveChilds() && $can_enable && - $altq->GetQname() <> $queue->GetQname()) { - if ($queue->GetDefault() <> "") + if ($queue->CanHaveChilds() && $can_enable) { + if ($altq->GetQname() <> $queue->GetQname() && $queue->GetDefault() <> "") $can_add = false; else $can_add = true; @@ -330,7 +329,7 @@ if ($can_add || $addnewaltq) { $output_form .= "&queue=" . $queue->GetQname(); } $output_form .= "&action=add\">"; - $output_form .= "<input type=\"button\" class=\"formbtn\" name=\"add\" value=\"Add Queue\">"; + $output_form .= "<input type=\"button\" class=\"formbtn\" name=\"add\" value=\"Add new queue\">"; $output_form .= "</a>"; $output_form .= "<a href=\"firewall_shaper.php?interface="; $output_form .= $interface . "&queue="; @@ -340,7 +339,7 @@ if ($can_add || $addnewaltq) { $output_form .= "&action=delete\">"; $output_form .= "<input type=\"button\" class=\"formbtn\" name=\"delete\""; if ($queue) - $output_form .= " value=\"Delete a queue\">"; + $output_form .= " value=\"Delete this queue\">"; else $output_form .= " value=\"Disable shaper on interface\">"; $output_form .= "</a>"; @@ -370,7 +369,7 @@ if ($queue || $altq) { } $output .= $output_form; -$pgtitle = "Firewall: Shaper: By Interface View"; +//$pgtitle = "Firewall: Shaper: By Interface View"; include("head.inc"); ?> |
