webui: Wireless pages refresh (#7836)

* initial release * updated to a more compact style, pagetitle fix
librenms · Dec 24, 2017 · e7486d5 · e7486d5
1 parent 5995725
commit e7486d5
Show file tree

Hide file tree

Showing 2 changed files with 61 additions and 40 deletions.
diff --git a/html/pages/wireless.inc.php b/html/pages/wireless.inc.php
@@ -23,6 +23,8 @@
  * @author     Tony Murray <murraytony@gmail.com>
  */
 
+$pagetitle[] = "Wireless";
+
 use LibreNMS\Device\WirelessSensor;
 
 $sensors = dbFetchColumn('SELECT `sensor_class` FROM `wireless_sensors` GROUP BY `sensor_class`');
@@ -36,62 +38,52 @@
     $vars['view'] = "nographs";
 }
 
-$link_array = array('page' => 'wireless');
-
-$pagetitle[] = "Wireless";
-
-print_optionbar_start('', '');
 
-echo('<span style="font-weight: bold;">Wireless</span> &#187; ');
+$link_array = array('page' => 'wireless');
 
+$linkoptions = '<span style="font-weight: bold;">Wireless</span> &#187; ';
 $sep = '';
 foreach ($valid_wireless_types as $type => $details) {
-    echo($sep);
+    $linkoptions .= $sep;
     if ($class == $type) {
-        echo("<span class='pagemenu-selected'>");
+        $linkoptions .= '<span class="pagemenu-selected">';
     }
 
-    echo(generate_link($details['short'], $link_array, array('metric'=> $type, 'view' => $vars['view'])));
+    $linkoptions .= generate_link($details['short'], $link_array, array('metric'=> $type, 'view' => $vars['view']));
 
     if ($class == $type) {
-        echo("</span>");
+        $linkoptions .= '</span>';
     }
 
     $sep = ' | ';
 }
-
 unset($sep);
 
-echo('<div style="float: right;">');
-
+$displayoptions = '';
 if ($vars['view'] == "graphs") {
-    echo('<span class="pagemenu-selected">');
+    $displayoptions .= '<span class="pagemenu-selected">';
 }
-echo(generate_link("Graphs", $link_array, array('metric'=> $class, 'view' => "graphs")));
+$displayoptions .= generate_link("Graphs", $link_array, array("metric"=> $class, "view" => "graphs"));
 if ($vars['view'] == "graphs") {
-    echo('</span>');
+    $displayoptions .= '</span>';
 }
 
-echo(' | ');
+$displayoptions .= ' | ';
 
 if ($vars['view'] != "graphs") {
-    echo('<span class="pagemenu-selected">');
+    $displayoptions .= '<span class="pagemenu-selected">';
 }
 
-echo(generate_link("No Graphs", $link_array, array('metric'=> $class, 'view' => "nographs")));
+$displayoptions .= generate_link("No Graphs", $link_array, array("metric"=> $class, "view" => "nographs"));
 
 if ($vars['view'] != "graphs") {
-    echo('</span>');
+    $displayoptions .= '</span>';
 }
 
-echo('</div>');
-
-print_optionbar_end();
-
 if (isset($valid_wireless_types[$class])) {
     $graph_type = 'wireless_' . $class;
     $unit = $valid_wireless_types[$class]['unit'];
-
+    $pagetitle[] = "Wireless :: ".$class;
     include $config['install_dir'] . '/html/pages/wireless/sensors.inc.php';
 } else {
     echo("No sensors of type " . $class . " found.");

diff --git a/html/pages/wireless/sensors.inc.php b/html/pages/wireless/sensors.inc.php
@@ -1,19 +1,48 @@
-<div class="table-responsive">
-    <table id="sensors" class="table table-hover table-condensed storage">
-        <thead>
-            <tr>
-                <th data-column-id="hostname">Device</th>
-                <th data-column-id="sensor_descr">Sensor</th>
-                <th data-column-id="graph" data-sortable="false" data-searchable="false"></th>
-                <th data-column-id="alert" data-sortable="false" data-searchable="false"></th>
-                <th data-column-id="sensor_current">Current</th>
-                <th data-column-id="sensor_limit_low" data-searchable="false">Low Limit</th>
-                <th data-column-id="sensor_limit" data-searchable="false">High Limit</th>
-            </tr>
-        </thead>
-    </table>
-</div>
+<?php
+/*
+ * LibreNMS
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License as published by the
+ * Free Software Foundation, either version 3 of the License, or (at your
+ * option) any later version.  Please see LICENSE.txt at the top level of
+ * the source code distribution for details.
+ *
+ * @package    LibreNMS
+ * @subpackage webui
+ * @link       http://librenms.org
+ * @copyright  2017 LibreNMS
+ * @author     LibreNMS Contributors
+*/
 
+?>
+<div class="panel panel-default panel-condensed">
+    <div class="panel-heading">
+        <div class="row" style="padding:0px 10px 0px 10px;">
+        <div class="pull-left">
+            <?php echo $linkoptions; ?>
+        </div>
+        <div class="pull-right">
+            <?php echo $displayoptions; ?>
+        </div>
+        </div>
+    </div>
+    <div class="table-responsive">
+        <table id="sensors" class="table table-hover table-condensed storage">
+            <thead>
+                <tr>
+                    <th data-column-id="hostname">Device</th>
+                    <th data-column-id="sensor_descr">Sensor</th>
+                    <th data-column-id="graph" data-sortable="false" data-searchable="false"></th>
+                    <th data-column-id="alert" data-sortable="false" data-searchable="false"></th>
+                    <th data-column-id="sensor_current">Current</th>
+                    <th data-column-id="sensor_limit_low" data-searchable="false">Low Limit</th>
+                    <th data-column-id="sensor_limit" data-searchable="false">High Limit</th>
+                </tr>
+            </thead>
+        </table>
+    </div>
+</div>
 <script>
     var grid = $("#sensors").bootgrid({
         ajax: true,