Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

webui: apps lineup #7994

Merged
merged 3 commits into from Jan 5, 2018
Merged

webui: apps lineup #7994

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
3cc43bb
enabled apps overview in top menu
crcro Jan 1, 2018
12b51b7
removed commented code, added copyright
crcro Jan 1, 2018
9b51422
removed copyright
crcro Jan 2, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
1 change: 1 addition & 0 deletions html/includes/print-menubar.php
View file
Open in desktop
Expand Up @@ -473,6 +473,7 @@
<li class="dropdown">
<a href="apps/" class="dropdown-toggle" data-hover="dropdown" data-toggle="dropdown"><i class="fa fa-tasks fa-fw fa-lg fa-nav-icons hidden-md" aria-hidden="true"></i> <span class="hidden-sm">Apps</span></a>
<ul class="dropdown-menu">
<li><a href="apps/"><i class="fa fa-object-group fa-fw fa-lg" aria-hidden="true"></i> Overview</a></li>
<?php

foreach ($app_list as $app) {
Expand Down
32 changes: 27 additions & 5 deletions html/pages/apps.inc.php
View file
Open in desktop
@@ -1,4 +1,26 @@
<?php
/*
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I've been thinking about this copyright you've added to files you've changed. I'm not 100% sure on the position but I would say that we shouldn't be adding a copyright that seems to claim it's done by LibreNMS contributors. Old historic files weren't written by us so I think you should remove this / these.

* 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.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*
* @package LibreNMS
* @subpackage webui
* @link http://librenms.org
* @copyright LibreNMS contributors
* @author LibreNMS contributors
*/

$pagetitle[] = 'Apps';

$graphs['apache'] = array(
'bits',
Expand Down Expand Up @@ -296,7 +318,8 @@
'arc_cache_miss',
);

print_optionbar_start();
echo '<div class="panel panel-default">';
echo '<div class="panel-heading">';

echo "<span style='font-weight: bold;'>Apps</span> &#187; ";

Expand All @@ -323,8 +346,8 @@
$sep = ' | ';
}

print_optionbar_end();

echo '</div>';
echo '<div class="panel-body">';
if ($vars['app']) {
if (is_file('pages/apps/'.mres($vars['app']).'.inc.php')) {
include 'pages/apps/'.mres($vars['app']).'.inc.php';
Expand All @@ -334,5 +357,4 @@
} else {
include 'pages/apps/overview.inc.php';
}

$pagetitle[] = 'Apps';
echo '</div>';