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

Merge branch 'master' of https://github.com/librenms/librenms into issue-2018

Browse Source
This commit is contained in:
laf
2015-10-11 19:32:40 +00:00
parent b0f638c0f9 65e6b4d101
commit 1b07d8ce13
38 changed files with 6298 additions and 3324 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/pages/device.inc.php
+4 -4
View File
@@ -32,11 +32,11 @@ if (device_permitted($vars['device']) || $check_device == $vars['device']) {
$device['os_group'] = $config['os'][$device['os']]['group'];
}
echo '<table style="margin: 0px 7px 7px 7px;" cellspacing="0" class="devicetable" width="99%">';
// include("includes/hostbox.inc.php");
require 'includes/device-header.inc.php';
echo '<div class="panel panel-default">';
echo '<table style="margin: 0px 7px 7px 7px;" cellspacing="0" class="devicetable" width="99%">';
require 'includes/device-header.inc.php';
echo '</table>';
echo '</div>';
if (device_permitted($device['device_id'])) {
html/pages/device/notes.inc.php
+1 -3
View File
@@ -20,9 +20,7 @@ $data = dbFetchRow("SELECT `notes` FROM `devices` WHERE device_id = ?", array(
<hr>
<div class="form-group">
<div class="col-sm-12">
<textarea class="form-control" rows="6" name="notes" id="device-notes">
<?php echo htmlentities($data['notes']); ?>
</textarea>
<textarea class="form-control" rows="6" name="notes" id="device-notes"><?php echo htmlentities($data['notes']); ?></textarea>
</div>
</div>
<div class="row">
html/pages/logon.inc.php
+19 -15
View File
@@ -5,37 +5,41 @@ if( $config['twofactor'] && isset($twofactorform) ) {
else {
?>
<div class="row">
<div class="col-md-4"></div>
<div class="col-md-4">
<div class="col-md-offset-4 col-md-4">
<div class="panel panel-default">
<div class="panel-heading">
<h3 class="panel-title">
<center>
<img src="images/librenms_logo_light.png">
</center></h3>
</center>
</h3>
</div>
<div class="panel-body">
<div class="container-fluid">
<form class="form-horizontal" role="form" action="" method="post" name="logonform">
<div class="form-group">
<input type="text" name="username" id="username" class="form-control" placeholder="Username" required autofocus />
<div class="col-md-12">
<input type="text" name="username" id="username" class="form-control" placeholder="Username" required autofocus />
</div>
</div>
<div class="form-group">
<input type="password" name="password" id="password" class="form-control" placeholder="Password" />
<div class="col-md-12">
<input type="password" name="password" id="password" class="form-control" placeholder="Password" />
</div>
</div>
<div class="form-group">
<label class="checkbox">
<input type="checkbox" name="remember" id="remember" /> Remember me.
</label>
<div class="col-md-12">
<div class="checkbox">
<label>
<input type="checkbox" name="remember" id="remember" /> Remember me.
</label>
</div>
</div>
</div>
<div class="form-group">
<button type="submit" class="btn btn-default btn-block" name="submit" type="submit">Login</button>
<div class="col-md-12">
<button type="submit" class="btn btn-default btn-block" name="submit" type="submit">Login</button>
</div>
</div>
<?php
if (isset($auth_message)) {