mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Replace legacy menu with new Blade generated one (#10173)

Browse Source 
* Remove legacy index php file

* fix routing page missing data

* WIP

* fix $navbar global usage

* remove global use of $locations

* ObjectCache again...

* move vars.inc.php to init.php for legacy ajax

* navbar is more local than I thought before.  Fix it.

* Fix some sensors tables escaping

* restore custom menu functionality, but with blade
and docs

* cleanup

* tidy menu @if checks

* Fix up the rest of the global variables and remove print-menubar.php

* consolidate some counting in the menu

* filter out empty custom port descr types

* Fix up custom port groups

* Fix up apps menu

* Fix services menu when all are ok

* Limit cached data to the user it is for

* Fix style

* A few clean ups

* fix pseudowire bug
This commit is contained in:
Tony Murray
2019-05-10 11:02:39 -05:00
committed by GitHub
parent 966ce85c19
commit 9ede688d13
29 changed files with 597 additions and 1513 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
includes/html/pages/apps/overview.inc.php
View File

@@ -9,24 +9,24 @@ $graph_array_zoom['height'] = '150';
$graph_array_zoom['width'] = '400';
$graph_array['legend'] = 'no';
foreach ($app_list as $app) {
foreach ($apps as $app) {
echo '<div style="clear: both;">';
echo '<h2>'.generate_link(nicecase($app['app_type']), array('page' => 'apps', 'app' => $app['app_type'])).'</h2>';
$app_devices = dbFetchRows('SELECT * FROM `devices` AS D, `applications` AS A WHERE D.device_id = A.device_id AND A.app_type = ?', array($app['app_type']));
echo '<h2>'.generate_link($app->displayName(), array('page' => 'apps', 'app' => $app->app_type)).'</h2>';
$app_devices = dbFetchRows('SELECT * FROM `devices` AS D, `applications` AS A WHERE D.device_id = A.device_id AND A.app_type = ?', array($app->app_type));
foreach ($app_devices as $app_device) {
$graph_type = $graphs[$app['app_type']][0];
$graph_type = $graphs[$app->app_type][0];
$graph_array['type'] = 'application_'.$app['app_type'].'_'.$graph_type;
$graph_array['type'] = 'application_'.$app->app_type.'_'.$graph_type;
$graph_array['id'] = $app_device['app_id'];
$graph_array_zoom['type'] = 'application_'.$app['app_type'].'_'.$graph_type;
$graph_array_zoom['type'] = 'application_'.$app->app_type.'_'.$graph_type;
$graph_array_zoom['id'] = $app_device['app_id'];
$link_array = $graph_array;
$link_array['page'] = 'device';
$link_array['device'] = $app_device['device_id'];
$link_array['tab'] = 'apps';
$link_array['app'] = $app['app_type'];
$link_array['app'] = $app->app_type;
unset($link_array['height'], $link_array['width']);
$overlib_url = generate_url($link_array);