Fix footer, remove ignored/disabled devices form status page, cleanup white space at top of page

This commit is contained in:
bohdan-s
2014-06-22 19:51:35 -04:00
parent 9fb82b844d
commit 282c4e705a
2 changed files with 8 additions and 19 deletions
+7 -3
View File
@@ -163,19 +163,24 @@ if (!$vars['bare'] == "yes") {
if ($_SESSION['authenticated'])
{
include("includes/print-menubar.php");
} else {
echo('<hr color="#444444" />');
}
}
?>
<br />
<div class="container-fluid">
<?php
if ($_SESSION['authenticated'])
{
?>
<div class="row">
<div class="col-md-12">
&nbsp;<br /><br />
</div>
</div>
<?php
}
?>
<div class="row">
<div class="col-md-12">
<?php
@@ -225,7 +230,6 @@ if ($_SESSION['authenticated'])
{
include("pages/logon.inc.php");
}
exit;
}
?>
</div>
+1 -16
View File
@@ -21,8 +21,7 @@ $(document).ready(function() {
$sql_param = array();
$pagetitle[] = "Public Devices";
$query = "SELECT * FROM `devices` ORDER BY hostname";
$query = "SELECT * FROM `devices` WHERE 1 AND disabled='0' AND `ignore`='0' ORDER BY hostname";
?>
<div class="well"><h3>System Status<button class="btn btn-default" type="submit" style="float:right;" id="ToggleLogon">Logon</button></h3></div>
@@ -46,17 +45,3 @@ foreach (dbFetchRows($query, $sql_param) as $device)
</table>
</div>
</div>
<footer>
<div class="container">
<div class="row">
<div class="col-md-12 text-center">
<?php
echo(' <br /> <br /> ' . (isset($config['footer']) ? $config['footer'] : ''));
echo(' <br />Powered by <a href="' . $config['project_url'] . '" target="_blank">' . $config['project_name_version'].'</a>. ');
echo( $config['project_name'].' is <a href="http://www.gnu.org/philosophy/free-sw.html">Free Software</a>, released under the <a href="http://www.gnu.org/copyleft/gpl.html">GNU GPLv3</a>.<br/>');
echo(' Copyright &copy; 2006-2012 by Adam Armstrong. Copyright &copy; 2013-'.date("Y").' by the '.$config['project_name'].' Contributors.');
?>
</div>
</div>
</div>
</footer>