summaryrefslogtreecommitdiffstats
path: root/src/usr
diff options
context:
space:
mode:
Diffstat (limited to 'src/usr')
-rw-r--r--src/usr/local/www/bootstrap/css/pfSense-dark.css24
-rwxr-xr-xsrc/usr/local/www/status_logs.php52
-rw-r--r--src/usr/local/www/status_queues.php49
-rw-r--r--src/usr/local/www/system.php4
4 files changed, 53 insertions, 76 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/status_logs.php b/src/usr/local/www/status_logs.php
index ffd1019..d033a00 100755
--- a/src/usr/local/www/status_logs.php
+++ b/src/usr/local/www/status_logs.php
@@ -436,33 +436,37 @@ if (!$rawfilter) {
</div>
<div class="panel-body">
<div class="table-responsive">
- <table class="table table-striped table-hover table-compact">
- <tr>
- <th><?=gettext("Time")?></th>
- <th><?=gettext("Process")?></th>
- <th><?=gettext("PID")?></th>
- <th style="width:100%"><?=gettext("Message")?></th>
- </tr>
+ <table class="table table-striped table-hover table-condensed sortable-theme-bootstrap" data-sortable>
+ <thead>
+ <tr>
+ <th><?=gettext("Time")?></th>
+ <th><?=gettext("Process")?></th>
+ <th><?=gettext("PID")?></th>
+ <th style="width:100%"><?=gettext("Message")?></th>
+ </tr>
+ </thead>
+ <tbody>
<?php
foreach ($filterlog as $filterent) {
?>
- <tr>
- <td style="white-space:nowrap;">
- <?=htmlspecialchars($filterent['time'])?>
- </td>
- <td style="white-space:nowrap;">
- <?=htmlspecialchars($filterent['process'])?>
- </td>
- <td style="white-space:nowrap;">
- <?=htmlspecialchars($filterent['pid'])?>
- </td>
- <td style="word-wrap:break-word; word-break:break-all; white-space:normal">
- <?=htmlspecialchars($filterent['message'])?>
- </td>
- </tr>
+ <tr>
+ <td style="white-space:nowrap;">
+ <?=htmlspecialchars($filterent['time'])?>
+ </td>
+ <td style="white-space:nowrap;">
+ <?=htmlspecialchars($filterent['process'])?>
+ </td>
+ <td style="white-space:nowrap;">
+ <?=htmlspecialchars($filterent['pid'])?>
+ </td>
+ <td style="word-wrap:break-word; word-break:break-all; white-space:normal">
+ <?=htmlspecialchars($filterent['message'])?>
+ </td>
+ </tr>
<?php
} // e-o-foreach
?>
+ </tbody>
</table>
<?php
if (count($filterlog) == 0)
@@ -542,7 +546,7 @@ $group->add(new Form_Checkbox(
'Forward',
($pconfig['cronorder'] == 'forward') ? true : false,
'forward'
-))->displayAsRadio();
+))->displayAsRadio()->setHelp('(newest at bottom)');
$group->add(new Form_Checkbox(
'cronorder',
@@ -550,7 +554,7 @@ $group->add(new Form_Checkbox(
'Reverse',
($pconfig['cronorder'] == 'reverse') ? true : false,
'reverse'
-))->displayAsRadio();
+))->displayAsRadio()->setHelp('(newest at top)');
$group->add(new Form_Checkbox(
'cronorder',
@@ -560,7 +564,7 @@ $group->add(new Form_Checkbox(
''
))->displayAsRadio();
-$group->setHelp('Show log entries in forward (newest at bottom) or reverse (newest at top) order.');
+$group->setHelp('Show log entries in forward or reverse order.');
$section->add($group);
$group = new Form_Group('GUI Log Entries');
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}&amp;queue={$if_name}&amp;action=show\">Root queue</a>";
- } else {
- echo "<a href=\"firewall_shaper.php?interface={$if_name}&amp;queue={$q['name']}&amp;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}&amp;queue={$if_name}&amp;action=show\">Root queue</a>";
+ } else {
+ echo "<a href=\"firewall_shaper.php?interface={$if_name}&amp;queue={$q['name']}&amp;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',
OpenPOWER on IntegriCloud