diff options
Diffstat (limited to 'src/usr/local/www')
| -rw-r--r-- | src/usr/local/www/bootstrap/css/pfSense-dark.css | 24 | ||||
| -rw-r--r-- | src/usr/local/www/bootstrap/css/pfSense.css | 30 | ||||
| -rw-r--r-- | src/usr/local/www/firewall_rules.php | 18 | ||||
| -rw-r--r-- | src/usr/local/www/firewall_rules_edit.php | 2 | ||||
| -rwxr-xr-x | src/usr/local/www/status_logs.php | 2 | ||||
| -rw-r--r-- | src/usr/local/www/status_logs_filter.php | 6 | ||||
| -rwxr-xr-x | src/usr/local/www/status_logs_filter_dynamic.php | 6 | ||||
| -rw-r--r-- | src/usr/local/www/status_logs_filter_summary.php | 2 | ||||
| -rw-r--r-- | src/usr/local/www/status_logs_settings.php | 2 | ||||
| -rw-r--r-- | src/usr/local/www/status_logs_vpn.php | 2 | ||||
| -rw-r--r-- | src/usr/local/www/status_queues.php | 49 | ||||
| -rw-r--r-- | src/usr/local/www/system.php | 4 | ||||
| -rw-r--r-- | src/usr/local/www/widgets/widgets/log.widget.php | 6 |
13 files changed, 55 insertions, 98 deletions
diff --git a/src/usr/local/www/bootstrap/css/pfSense-dark.css b/src/usr/local/www/bootstrap/css/pfSense-dark.css index 68b6891..63380de 100644 --- a/src/usr/local/www/bootstrap/css/pfSense-dark.css +++ b/src/usr/local/www/bootstrap/css/pfSense-dark.css @@ -302,30 +302,6 @@ a.list-group-item .list-group-item-heading, .list-group-item .list-group-item-he } /** create icon colors */ -.icon-black -{ - color: #000000; -} - -.icon-danger -{ - color: #F44336; -} - -.icon-success -{ - color: #5CB85C; -} - -.icon-warning { - color: #FDD835; -} - -.icon-primary -{ - color: #009688; -} - .bg-primary { color: #000; background-color: #009688; diff --git a/src/usr/local/www/bootstrap/css/pfSense.css b/src/usr/local/www/bootstrap/css/pfSense.css index 622ca6e..59ba403 100644 --- a/src/usr/local/www/bootstrap/css/pfSense.css +++ b/src/usr/local/www/bootstrap/css/pfSense.css @@ -471,33 +471,17 @@ footer a { overflow-x: auto; } -/** create icon colors */ -.icon-black -{ - color: #000000; -} - -.icon-danger -{ - color: #D9534F; -} - -.icon-success -{ - color: #5CB85C; -} - -.icon-primary -{ - color: #337AB7; +/** create text colors */ +.text-warning { + color: #F57F17; } -.icon-warning { - color: #FDD835; +.text-success { + color: #4CAF50; } -.text-warning { - color: #F57F17; +.text-danger { + color: #B71C1C; } .btn-success { diff --git a/src/usr/local/www/firewall_rules.php b/src/usr/local/www/firewall_rules.php index 70371de..641f647 100644 --- a/src/usr/local/www/firewall_rules.php +++ b/src/usr/local/www/firewall_rules.php @@ -303,7 +303,7 @@ display_top_tabs($tab_array); ?> <tr id="antilockout"> <td></td> - <td title="<?=gettext("traffic is passed")?>"><i class="fa fa-check icon-success"></i></td> + <td title="<?=gettext("traffic is passed")?>"><i class="fa fa-check text-success"></i></td> <td>*</td> <td>*</td> <td>*</td> @@ -321,7 +321,7 @@ display_top_tabs($tab_array); <?php if (isset($config['interfaces'][$if]['blockpriv'])): ?> <tr id="frrfc1918"> <td></td> - <td title="<?=gettext("traffic is blocked")?>"><i class="fa fa-times icon-danger"></i></td> + <td title="<?=gettext("traffic is blocked")?>"><i class="fa fa-times text-danger"></i></td> <td>*</td> <td><?=gettext("RFC 1918 networks");?></td> <td>*</td> @@ -339,7 +339,7 @@ display_top_tabs($tab_array); <?php if (isset($config['interfaces'][$if]['blockbogons'])): ?> <tr id="frrfc1918"> <td></td> - <td title="<?=gettext("traffic is blocked")?>"><i class="fa fa-times icon-danger"></i></td> + <td title="<?=gettext("traffic is blocked")?>"><i class="fa fa-times text-danger"></i></td> <td>*</td> <td><?=gettext("Reserved/not assigned by IANA");?></td> <td>*</td> @@ -375,16 +375,16 @@ for ($i = 0; isset($a_filter[$i]); $i++): <?php if ($filterent['type'] == "block") { - $iconfn = "times icon-danger"; + $iconfn = "times text-danger"; $title_text = gettext("traffic is blocked"); } else if ($filterent['type'] == "reject") { - $iconfn = "hand-stop-o icon-warning"; + $iconfn = "hand-stop-o text-warning"; $title_text = gettext("traffic is rejected"); } else if ($filterent['type'] == "match") { $iconfn = "filter"; $title_text = gettext("traffic is matched"); } else { - $iconfn = "check icon-success"; + $iconfn = "check text-success"; $title_text = gettext("traffic is passed"); } ?> @@ -691,10 +691,10 @@ for ($i = 0; isset($a_filter[$i]); $i++): <dl class="dl-horizontal responsive"> <!-- Legend --> <dt><?=gettext('Legend')?></dt> <dd></dd> - <dt><i class="fa fa-check icon-success"></i></dt> <dd><?=gettext("Pass");?></dd> + <dt><i class="fa fa-check text-success"></i></dt> <dd><?=gettext("Pass");?></dd> <dt><i class="fa fa-filter"></i></dt> <dd><?=gettext("Match");?></dd> - <dt><i class="fa fa-times icon-danger"></i></dt> <dd><?=gettext("Block");?></dd> - <dt><i class="fa fa-hand-stop-o icon-warning"></i></dt> <dd><?=gettext("Reject");?></dd> + <dt><i class="fa fa-times text-danger"></i></dt> <dd><?=gettext("Block");?></dd> + <dt><i class="fa fa-hand-stop-o text-warning"></i></dt> <dd><?=gettext("Reject");?></dd> <dt><i class="fa fa-tasks"></i></dt> <dd> <?=gettext("Log");?></dd> <dt><i class="fa fa-cog"></i></dt> <dd> <?=gettext("Advanced filter");?></dd> </dl> diff --git a/src/usr/local/www/firewall_rules_edit.php b/src/usr/local/www/firewall_rules_edit.php index 5190081..0da4ac9 100644 --- a/src/usr/local/www/firewall_rules_edit.php +++ b/src/usr/local/www/firewall_rules_edit.php @@ -1368,7 +1368,7 @@ $section->addInput(new Form_Checkbox( $pconfig['log'] ))->setHelp('Hint: the firewall has limited local log space. Don\'t turn on logging '. 'for everything. If you want to do a lot of logging, consider using a remote '. - 'syslog server (see the <a href="diag_logs_settings.php">Status: System logs: '. + 'syslog server (see the <a href="status_logs_settings.php">Status: System logs: '. 'Settings</a> page).'); $section->addInput(new Form_Input( diff --git a/src/usr/local/www/status_logs.php b/src/usr/local/www/status_logs.php index a4bdeff..d033a00 100755 --- a/src/usr/local/www/status_logs.php +++ b/src/usr/local/www/status_logs.php @@ -296,7 +296,7 @@ $tab_array[] = array(gettext("VPN"), false, "status_logs_vpn.php"); $tab_array[] = array(gettext("Load Balancer"), ($logfile == 'relayd'), "status_logs.php?logfile=relayd"); $tab_array[] = array(gettext("OpenVPN"), ($logfile == 'openvpn'), "status_logs.php?logfile=openvpn"); $tab_array[] = array(gettext("NTP"), ($logfile == 'ntpd'), "status_logs.php?logfile=ntpd"); -$tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php"); +$tab_array[] = array(gettext("Settings"), false, "status_logs_settings.php"); display_top_tabs($tab_array); $tab_array = array(); diff --git a/src/usr/local/www/status_logs_filter.php b/src/usr/local/www/status_logs_filter.php index 96799cf..6ccd914 100644 --- a/src/usr/local/www/status_logs_filter.php +++ b/src/usr/local/www/status_logs_filter.php @@ -191,7 +191,7 @@ $tab_array[] = array(gettext("VPN"), false, "status_logs_vpn.php"); $tab_array[] = array(gettext("Load Balancer"), false, "status_logs.php?logfile=relayd"); $tab_array[] = array(gettext("OpenVPN"), false, "status_logs.php?logfile=openvpn"); $tab_array[] = array(gettext("NTP"), false, "status_logs.php?logfile=ntpd"); -$tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php"); +$tab_array[] = array(gettext("Settings"), false, "status_logs_settings.php"); display_top_tabs($tab_array); $tab_array = array(); @@ -419,9 +419,9 @@ if (!isset($config['syslog']['rawfilter'])) { <td> <?php if ($filterent['act'] == "block") { - $icon_act = "fa-times icon-danger"; + $icon_act = "fa-times text-danger"; } else { - $icon_act = "fa-check icon-success"; + $icon_act = "fa-check text-success"; } ?> <i class="fa <?php echo $icon_act;?> icon-pointer" title="<?php echo $filterent['act'] .'/'. $filterent['tracker'];?>" onclick="javascript:getURL('status_logs_filter.php?getrulenum=<?="{$filterent['rulenum']},{$filterent['tracker']},{$filterent['act']}"; ?>', outputrule);"></i> diff --git a/src/usr/local/www/status_logs_filter_dynamic.php b/src/usr/local/www/status_logs_filter_dynamic.php index fb8c8d7..63771f5 100755 --- a/src/usr/local/www/status_logs_filter_dynamic.php +++ b/src/usr/local/www/status_logs_filter_dynamic.php @@ -335,7 +335,7 @@ $tab_array[] = array(gettext("VPN"), false, "status_logs_vpn.php"); $tab_array[] = array(gettext("Load Balancer"), false, "status_logs.php?logfile=relayd"); $tab_array[] = array(gettext("OpenVPN"), false, "status_logs.php?logfile=openvpn"); $tab_array[] = array(gettext("NTP"), false, "status_logs.php?logfile=ntpd"); -$tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php"); +$tab_array[] = array(gettext("Settings"), false, "status_logs_settings.php"); display_top_tabs($tab_array); $tab_array = array(); @@ -394,9 +394,9 @@ display_top_tabs($tab_array, false, 'nav nav-tabs'); <td> <?php if ($filterent['act'] == "block") { - $icon_act = "fa-times icon-danger"; + $icon_act = "fa-times text-danger"; } else { - $icon_act = "fa-check icon-success"; + $icon_act = "fa-check text-success"; } ?> <i class="fa <?php echo $icon_act;?> icon-pointer" title="<?php echo $filterent['act'] .'/'. $filterent['tracker'];?>" onclick="javascript:getURL('status_logs_filter.php?getrulenum=<?="{$filterent['rulenum']},{$filterent['tracker']},{$filterent['act']}"; ?>', outputrule);"></i> diff --git a/src/usr/local/www/status_logs_filter_summary.php b/src/usr/local/www/status_logs_filter_summary.php index e2bb41c..a460577 100644 --- a/src/usr/local/www/status_logs_filter_summary.php +++ b/src/usr/local/www/status_logs_filter_summary.php @@ -287,7 +287,7 @@ $tab_array[] = array(gettext("VPN"), false, "status_logs_vpn.php"); $tab_array[] = array(gettext("Load Balancer"), false, "status_logs.php?logfile=relayd"); $tab_array[] = array(gettext("OpenVPN"), false, "status_logs.php?logfile=openvpn"); $tab_array[] = array(gettext("NTP"), false, "status_logs.php?logfile=ntpd"); -$tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php"); +$tab_array[] = array(gettext("Settings"), false, "status_logs_settings.php"); display_top_tabs($tab_array); $tab_array = array(); diff --git a/src/usr/local/www/status_logs_settings.php b/src/usr/local/www/status_logs_settings.php index bdc6324..0152471 100644 --- a/src/usr/local/www/status_logs_settings.php +++ b/src/usr/local/www/status_logs_settings.php @@ -1,4 +1,4 @@ -status_logs_vpn.php<?php +<?php /* status_logs_settings.php */ diff --git a/src/usr/local/www/status_logs_vpn.php b/src/usr/local/www/status_logs_vpn.php index dac2a79..403daee 100644 --- a/src/usr/local/www/status_logs_vpn.php +++ b/src/usr/local/www/status_logs_vpn.php @@ -162,7 +162,7 @@ $tab_array[] = array(gettext("VPN"), true, "status_logs_vpn.php"); $tab_array[] = array(gettext("Load Balancer"), false, "status_logs.php?logfile=relayd"); $tab_array[] = array(gettext("OpenVPN"), false, "status_logs.php?logfile=openvpn"); $tab_array[] = array(gettext("NTP"), false, "status_logs.php?logfile=ntpd"); -$tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php"); +$tab_array[] = array(gettext("Settings"), false, "status_logs_settings.php"); display_top_tabs($tab_array); $tab_array = array(); diff --git a/src/usr/local/www/status_queues.php b/src/usr/local/www/status_queues.php index 57ddccd..d4e5477 100644 --- a/src/usr/local/www/status_queues.php +++ b/src/usr/local/www/status_queues.php @@ -150,7 +150,6 @@ $pgtitle = array(gettext("Status"), gettext("Traffic shaper"), gettext("Queues") $shortcut_section = "trafficshaper"; include("head.inc"); ?> -<body> <script src="/jquery/jquery-1.11.2.min.js"></script> <?php if (!is_array($config['shaper']['queue']) || count($config['shaper']['queue']) < 1) { @@ -222,7 +221,7 @@ else: ?> ?> </div> </div> -</br> +<br/> <?php @@ -266,38 +265,36 @@ function processQueues($altqstats, $level, $parent_name) { } } if ($prev_if != $q['interface']) { - echo "<tr><td><b>Interface ". htmlspecialchars(convert_real_interface_to_friendly_descr($q['interface'])) . "</b></td></tr>"; + echo "<tr><td colspan=\"8\"><b>Interface " . htmlspecialchars(convert_real_interface_to_friendly_descr($q['interface'])) . "</b></td></tr>\n"; $prev_if = $q['interface']; } ?> <tr class="<?php echo $parent_name?>"> - <td bgcolor="#<?php echo $row_background?>" style="padding-left: <?php echo $level * 20?>px;"> - <font color="#000000"> - <? - if (is_array($q['queue'])) { - echo "<a href=\"#\" onclick=\"StatsShowHide('queuerow{$q['name']}{$q['interface']}');return false\">+/-</a> "; - } - if (strstr($q['name'], "root_")) { - echo "<a href=\"firewall_shaper.php?interface={$if_name}&queue={$if_name}&action=show\">Root queue</a>"; - } else { - echo "<a href=\"firewall_shaper.php?interface={$if_name}&queue={$q['name']}&action=show\">" . htmlspecialchars($q['name']) . "</a>"; - } - ?> - </font> + <td style="background-color:#<?php echo $row_background?>;padding-left:<?php echo $level * 20?>px;"> + <?php + if (is_array($q['queue'])) { + echo "<a href=\"#\" onclick=\"StatsShowHide('queuerow{$q['name']}{$q['interface']}');return false\">+/-</a>"; + } + if (strstr($q['name'], "root_")) { + echo "<a href=\"firewall_shaper.php?interface={$if_name}&queue={$if_name}&action=show\">Root queue</a>"; + } else { + echo "<a href=\"firewall_shaper.php?interface={$if_name}&queue={$q['name']}&action=show\">" . htmlspecialchars($q['name']) . "</a>"; + } + ?> </td> <?php $cpuUsage = 0; - echo "<td bgcolor=\"#{$row_background}\">"; - echo "<div class='progress' style='height: 7px;width: 170px;'> - <div class='progress-bar' role='progressbar' name='queue{$q['name']}{$q['interface']}width' id='queue{$q['name']}{$q['interface']}width' aria-valuenow='70' aria-valuemin='0' aria-valuemax='100' style='width: ". ($cpuUsage*100) ."%;'></div> + echo "<td style=\"background-color:#{$row_background}\" >"; + echo "<div class=\"progress\" style=\"height: 7px;width: 170px;\"> + <div class=\"progress-bar\" role=\"progressbar\" id=\"queue{$q['name']}{$q['interface']}width\" aria-valuenow=\"70\" aria-valuemin=\"0\" aria-valuemax=\"100\" style=\"width: " . ($cpuUsage*100) . "%;\"></div> </div>"; - echo " </td>"; - echo "<td bgcolor=\"#{$row_background}\"><input style='border: 0px solid white; background-color:#{$row_background}; color:#000000;width:70px;text-align:right;' size='10' name='queue{$q['name']}{$q['interface']}pps' id='queue{$q['name']}{$q['interface']}pps' value='(" . gettext("Loading") . ")' align='left' /></td>"; - echo "<td bgcolor=\"#{$row_background}\"><input style='border: 0px solid white; background-color:#{$row_background}; color:#000000;width:80px;text-align:right;' size='10' name='queue{$q['name']}{$q['interface']}bps' id='queue{$q['name']}{$q['interface']}bps' value='' align='right' /></td>"; - echo "<td bgcolor=\"#{$row_background}\"><input style='border: 0px solid white; background-color:#{$row_background}; color:#000000;width:70px;text-align:right;' size='10' name='queue{$q['name']}{$q['interface']}borrows' id='queue{$q['name']}{$q['interface']}borrows' value='' align='right' /></td>"; - echo "<td bgcolor=\"#{$row_background}\"><input style='border: 0px solid white; background-color:#{$row_background}; color:#000000;width:70px;text-align:right;' size='10' name='queue{$q['name']}{$q['interface']}suspends' id='queue{$q['name']}{$q['interface']}suspends' value='' align='right' /></td>"; - echo "<td bgcolor=\"#{$row_background}\"><input style='border: 0px solid white; background-color:#{$row_background}; color:#000000;width:70px;text-align:right;' size='10' name='queue{$q['name']}{$q['interface']}drops' id='queue{$q['name']}{$q['interface']}drops' value='' align='right' /></td>"; - echo "<td bgcolor=\"#{$row_background}\"><input style='border: 0px solid white; background-color:#{$row_background}; color:#000000;width:70px;text-align:right;' size='10' name='queue{$q['name']}{$q['interface']}length' id='queue{$q['name']}{$q['interface']}length' value='' align='right' /></td>"; + echo "</td>"; + echo "<td style=\"background-color:#{$row_background}\"><input style=\"border:0;width:70px;text-align:right;\" size=\"10\" name=\"queue{$q['name']}{$q['interface']}pps\" id=\"queue{$q['name']}{$q['interface']}pps\" value=\"(" . gettext("Loading") . ")\" /></td>"; + echo "<td style=\"background-color:#{$row_background}\"><input style=\"border:0;width:80px;text-align:right;\" size=\"10\" name=\"queue{$q['name']}{$q['interface']}bps\" id=\"queue{$q['name']}{$q['interface']}bps\" value=\"\" /></td>"; + echo "<td style=\"background-color:#{$row_background}\"><input style=\"border:0;width:70px;text-align:right;\" size=\"10\" name=\"queue{$q['name']}{$q['interface']}borrows\" id=\"queue{$q['name']}{$q['interface']}borrows\" value=\"\" /></td>"; + echo "<td style=\"background-color:#{$row_background}\"><input style=\"border:0;width:70px;text-align:right;\" size=\"10\" name=\"queue{$q['name']}{$q['interface']}suspends\" id=\"queue{$q['name']}{$q['interface']}suspends\" value=\"\" /></td>"; + echo "<td style=\"background-color:#{$row_background}\"><input style=\"border:0;width:70px;text-align:right;\" size=\"10\" name=\"queue{$q['name']}{$q['interface']}drops\" id=\"queue{$q['name']}{$q['interface']}drops\" value=\"\" /></td>"; + echo "<td style=\"background-color:#{$row_background}\"><input style=\"border:0;width:70px;text-align:right;\" size=\"10\" name=\"queue{$q['name']}{$q['interface']}length\" id=\"queue{$q['name']}{$q['interface']}length\" value=\"\" /></td>"; ?> </tr> <?php diff --git a/src/usr/local/www/system.php b/src/usr/local/www/system.php index 175fd6d..051dcae 100644 --- a/src/usr/local/www/system.php +++ b/src/usr/local/www/system.php @@ -487,14 +487,14 @@ $section->addInput(new Form_Select( 'Theme', $pconfig['webguicss'], $csslist -))->setHelp('<span class="badge" title="This feature is in BETA">BETA</span> Choose an alternative css file (if installed) to change the appearance of the Web configurator. css files are located in /usr/local/www/bootstrap/css'); +))->setHelp('Choose an alternative css file (if installed) to change the appearance of the Web configurator. css files are located in /usr/local/www/bootstrap/css'); $section->addInput(new Form_Select( 'webguifixedmenu', 'Top Navigation', $pconfig['webguifixedmenu'], ["" => "Scrolls with page", "fixed" => "Fixed (Remains visible at top of page)"] -))->setHelp("<span class=\"badge bg-danger\" title=\"This feature is in BETA\">BETA</span>"); +))->setHelp("The fixed option is intended for large screens only."); $section->addInput(new Form_Input( 'dashboardcolumns', diff --git a/src/usr/local/www/widgets/widgets/log.widget.php b/src/usr/local/www/widgets/widgets/log.widget.php index fb31aef..1d5874f 100644 --- a/src/usr/local/www/widgets/widgets/log.widget.php +++ b/src/usr/local/www/widgets/widgets/log.widget.php @@ -150,13 +150,13 @@ if (isset($_POST['lastsawtime'])) { } if ($filterent['act'] == "block") { - $iconfn = "times icon-danger"; + $iconfn = "times text-danger"; } else if ($filterent['act'] == "reject") { - $iconfn = "hand-stop-o icon-warning"; + $iconfn = "hand-stop-o text-warning"; } else if ($filterent['act'] == "match") { $iconfn = "filter"; } else { - $iconfn = "check icon-success"; + $iconfn = "check text-success"; } $rule = find_rule_by_number($filterent['rulenum'], $filterent['tracker'], $filterent['act']); |
