nicolas/librenms
1
0
Fork 0
mirror of https://github.com/stylersnico/librenms.git synced 2026-07-28 00:24:21 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #224 from libertysys/master

Browse Source 
Front page cleanup
This commit is contained in:
Paul Gear
2014-06-14 15:14:36 +10:00
parent 1c8be6e9c0 608966e2ab
commit 7fe1221602
6 changed files with 116 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/includes/device-summary-horiz.inc.php
+45
View File
@@ -0,0 +1,45 @@
<?php
include_once("includes/object-cache.inc.php");
?>
<div class="panel panel-default panel-condensed">
<table class="table table-hover table-condensed table-striped">
<thead>
<tr class="info">
<th>&nbsp;</th>
<th>Total</th>
<th>Up</th>
<th>Down</th>
<th>Ignored</th>
<th>Disabled</th>
</tr>
</thead>
<tbody>
<tr class="active">
<td><a href="devices/">Devices</a></td>
<td><a href="devices/"><span><?php echo($devices['count']) ?></span></a></td>
<td><a href="devices/state=up/format=list_detail/"><span class="green"> <?php echo($devices['up']) ?> up</span></a></td>
<td><a href="devices/state=down/format=list_detail/"><span class="red"> <?php echo($devices['down']) ?> down</span></a></td>
<td><a href="devices/ignore=1/format=list_detail/"><span class="grey"> <?php echo($devices['ignored']) ?> ignored </span></a></td>
<td><a href="devices/disabled=1/format=list_detail/"><span class="black"> <?php echo($devices['disabled']) ?> disabled</span></a></td>
</tr>
<tr class="active">
<td><a href="ports/">Ports</a></td>
<td><a href="ports/"><span><?php echo($ports['count']) ?></span></a></td>
<td><a href="ports/format=list_detail/state=up/"><span class="green"> <?php echo($ports['up']) ?> up </span></a></td>
<td><a href="ports/format=list_detail/state=down/"><span class="red"> <?php echo($ports['down']) ?> down </span></a></td>
<td><a href="ports/format=list_detail/ignore=1/"><span class="grey"> <?php echo($ports['ignored']) ?> ignored </span></a></td>
<td><a href="ports/format=list_detail/state=admindown/"><span class="black"> <?php echo($ports['shutdown']) ?> shutdown</span></a></td>
</tr>
<?php if ($config['show_services']) { ?>
<tr class="active">
<td><a href="services/">Services</a></td>
<td><a href="services/"><span><?php echo($services['count']) ?></span></a></td>
<td><a href="services/state=up/view=details/"><span class="green"><?php echo($services['up']) ?> up</span></a></td>
<td><a href="services/state=down/view=details/"><span class="red"> <?php echo($services['down']) ?> down</span></a></td>
<td><a href="services/ignore=1/view=details/"><span class="grey"> <?php echo($services['ignored']) ?> ignored</span></a></td>
<td><a href="services/disabled=1/view=details/"><span class="black"> <?php echo($services['disabled']) ?> disabled</span></a></td>
</tr>
<?php } ?>
</tbody>
</table>
</div>
html/includes/device-summary-vert.inc.php
+59
View File
@@ -0,0 +1,59 @@
<?php
include_once("includes/object-cache.inc.php");
?>
<div class="panel panel-default panel-condensed">
<table class="table table-hover table-condensed table-striped">
<thead>
<tr class="info">
<th>Summary</th>
<th><a href="devices/">Devices</a></th>
<th><a href="ports/">Ports</a></th>
<?php if ($config['show_services']) { ?>
<th><a href="services/">Services</a></th>
<?php } ?>
</tr>
</thead>
<tbody>
<tr class="active">
<th><span class="green">Up</span></th>
<td><a href="devices/format=list_detail/state=up/"><span class="green"><?php echo($devices['up']) ?></span></a></td>
<td><a href="ports/format=list_detail/state=up/"><span class="green"><?php echo($ports['up']) ?></span></a></td>
<?php if ($config['show_services']) { ?>
<td><a href="services/view=details/state=up/"><span class="green"><?php echo($services['up']) ?></span></a></td>
<?php } ?>
</tr>
<tr class="active">
<th><span class="red">Down</span></th>
<td><a href="devices/format=list_detail/state=down/"><span class="red"><?php echo($devices['down']) ?></span></a></td>
<td><a href="ports/format=list_detail/state=down/"><span class="red"><?php echo($ports['down']) ?></span></a></td>
<?php if ($config['show_services']) { ?>
<td><a href="services/view=details/state=down/"><span class="red"><?php echo($services['down']) ?></span></a></td>
<?php } ?>
</tr>
<tr class="active">
<th><span class="grey">Ignored</span></th>
<td><a href="devices/format=list_detail/ignore=1/"><span class="grey"><?php echo($devices['ignored']) ?></span></a></td>
<td><a href="ports/format=list_detail/ignore=1/"><span class="grey"><?php echo($ports['ignored']) ?></span></a></td>
<?php if ($config['show_services']) { ?>
<td><a href="services/view=details/ignore=1/"><span class="grey"><?php echo($services['ignored']) ?></span></a></td>
<?php } ?>
</tr>
<tr class="active">
<th><span class="black">Disabled/Shutdown</span></th>
<td><a href="devices/format=list_detail/disabled=1/"><span class="black"><?php echo($devices['disabled']) ?></span></a></td>
<td><a href="ports/format=list_detail/state=admindown/"><span class="black"><?php echo($ports['shutdown']) ?></span></a></td>
<?php if ($config['show_services']) { ?>
<td><a href="services/view=details/disabled=1/"><span class="black"><?php echo($services['disabled']) ?></span></a></td>
<?php } ?>
</tr>
<tr class="active">
<th>Total</th>
<td><a href="devices/"><span><?php echo($devices['count']) ?></span></a></td>
<td><a href="ports/"><span><?php echo($ports['count']) ?></span></a></td>
<?php if ($config['show_services']) { ?>
<td><a href="services/"><span><?php echo($services['count']) ?></span></a></td>
<?php } ?>
</tr>
</tbody>
</table>
</div>
html/includes/header.inc.php
-69
View File
@@ -1,69 +0,0 @@
<div id="gumax-header">
<div id="gumax-p-logo">
<div id="p-logo">
<?php
if ($config['title_image'])
{
echo('<a style="background-image: ' . $config['title_image'] . '" accesskey="z" href=""></a>');
}
else
{
echo('<a href=""><h2>'.$config['project_name'].'</h2></a>');
}
?>
</div>
<script type="text/javascript"> if (window.isMSIE55) fixalpha(); </script>
</div>
<!-- end of gumax-p-logo -->
<!-- Login Tools -->
<div id="gumax-p-login">
<?php
echo('<a target="_blank" href="'.$config['project_issues'].'">Report Bug</a> | ');
$toggle_url = preg_replace('/(\?|\&)widescreen=(yes|no)/', '', $_SERVER['REQUEST_URI']);
if (strstr($toggle_url,'?')) { $toggle_url .= '&amp;'; } else { $toggle_url .= '?'; }
if($_SESSION['widescreen'] === 1)
{
echo('<a href="' . $toggle_url . 'widescreen=no" title="Switch to normal screen width layout">Normal width</a> | ');
} else {
echo('<a href="' . $toggle_url . 'widescreen=yes" title="Switch to wide screen layout">Widescreen</a> | ');
}
if ($_SESSION['authenticated'])
{
echo("Logged in as <b>".$_SESSION['username']."</b>");
} else {
echo("Not logged in!");
}
if (Net_IPv6::checkIPv6($_SERVER['REMOTE_ADDR']))
{
echo(' via <b>IPv6</b>');
} else {
echo(' via <b>IPv4</b>');
}
if ($_SESSION['authenticated'])
{
echo(" (<a href='logout/'>Logout</a>)");
}
?>
</div>
<div style="float: right;">
<?php
if (isset($_SESSION['authenticated']) && $_SESSION['authenticated'])
{
include("includes/topnav.inc.php");
}
?>
</div>
</div>
<!-- //// end of gumax-header //// -->
html/includes/topnav.inc.php → html/includes/object-cache.inc.php
-51
View File
@@ -69,54 +69,3 @@ if ($ports['down']) { $ports['bgcolour'] = "#ffcccc"; } else { $ports['bgcolo
if ($services['down']) { $services['bgcolour'] = "#ffcccc"; } else { $services['bgcolour'] = "transparent"; }
?>
<div class="container-fluid">
<div class="row">
<div class="col-md-6">
<div class="panel panel-default panel-condensed">
<table class="table table-hover table-condensed table-striped">
<thead>
<tr class="info">
<th>&nbsp;</th>
<th>Total</th>
<th>Up</th>
<th>Down</th>
<th>Ignored</th>
<th>Disabled</th>
</tr>
</thead>
<tbody>
<tr class="active">
<td><a href="devices/">Devices</a></td>
<td><a href="devices/"><span><?php echo($devices['count']) ?></span></a></td>
<td><a href="devices/state=up/format=list_detail/"><span class="green"> <?php echo($devices['up']) ?> up</span></a></td>
<td><a href="devices/state=down/format=list_detail/"><span class="red"> <?php echo($devices['down']) ?> down</span></a></td>
<td><a href="devices/ignore=1/format=list_detail/"><span class="grey"> <?php echo($devices['ignored']) ?> ignored </span></a></td>
<td><a href="devices/disabled=1/format=list_detail/"><span class="black"> <?php echo($devices['disabled']) ?> disabled</span></a></td>
</tr>
<tr class="active">
<td><a href="ports/">Ports</a></td>
<td><a href="ports/"><span><?php echo($ports['count']) ?></span></a></td>
<td><a href="ports/format=list_detail/state=up/"><span class="green"> <?php echo($ports['up']) ?> up </span></a></td>
<td><a href="ports/format=list_detail/state=down/"><span class="red"> <?php echo($ports['down']) ?> down </span></a></td>
<td><a href="ports/format=list_detail/ignore=1/"><span class="grey"> <?php echo($ports['ignored']) ?> ignored </span></a></td>
<td><a href="ports/format=list_detail/state=admindown/"><span class="black"> <?php echo($ports['shutdown']) ?> shutdown</span></a></td>
</tr>
<?php if ($config['show_services']) { ?>
<tr class="active">
<td><a href="services/">Services</a></td>
<td><a href="services/"><span><?php echo($services['count']) ?></span></a></td>
<td><a href="services/state=up/view=details/"><span class="green"><?php echo($services['up']) ?> up</span></a></td>
<td><a href="services/state=down/view=details/"><span class="red"> <?php echo($services['down']) ?> down</span></a></td>
<td><a href="services/ignore=1/view=details/"><span class="grey"> <?php echo($services['ignored']) ?> ignored</span></a></td>
<td><a href="services/disabled=1/view=details/"><span class="black"> <?php echo($services['disabled']) ?> disabled</span></a></td>
</tr>
<?php } ?>
</tbody>
</table>
</div>
</div>
<div class="col-md-6">
&nbsp;
</div>
</div>
</div>
html/pages/front/default.php
+11 -4
View File
@@ -1,6 +1,6 @@
<?php
include("includes/topnav.inc.php");
include_once("includes/object-cache.inc.php");
function generate_front_box ($frontbox_class, $content)
{
@@ -11,7 +11,7 @@ echo("<div class=\"front-box $frontbox_class\">
echo('
<div class="row">
<div class="col-md-8">
<div class="col-md-9">
');
echo('<div class=front-page>');
@@ -121,10 +121,17 @@ echo('</div>');
echo('</div>');
echo('</div>');
echo('
<div class="col-md-4">
<div class="col-md-3">
');
include_once("includes/front/boxes.inc.php");
if ($config['vertical_summary'])
{
include_once("includes/device-summary-vert.inc.php");
}
else
{
include_once("includes/device-summary-horiz.inc.php");
}
echo('
</div>
includes/defaults.inc.php
+1 -1
View File
@@ -110,13 +110,13 @@ $config['page_refresh'] = "300"; // Refresh the page every xx seconds, 0 to
$config['front_page'] = "pages/front/default.php";
$config['front_page_settings']['top']['ports'] = 10;
$config['front_page_settings']['top']['devices'] = 10;
$config['vertical_summary'] = 0; // Enable to use vertical summary on front page instead of horizontal
$config['top_ports'] = 1; // This enables the top X ports box
$config['top_devices'] = 1; // This enables the top X devices box
$config['page_title_prefix'] = "";
$config['page_title_suffix'] = $config['project_name'];
$config['timestamp_format'] = 'd-m-Y H:i:s';
$config['page_gen'] = 0; # display MySqL & PHP stats in footer?
$config['web_header'] = "header.inc.php"; # in html/includes
$config['login_message'] = "Unauthorised access or use shall render the user liable to criminal and/or civil prosecution.";
$config['old_graphs'] = 1; // RRDfiles from before the great rra reform. This is default for a while.