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

fixing lits of bits of html removing borders, adding submit class to buttons

Browse Source 
git-svn-id: http://www.observium.org/svn/observer/trunk@778 61d68cd4-352d-0410-923a-c4978735b2b8
This commit is contained in:
Adam Amstrong
2010-02-07 14:17:02 +00:00
parent e9ef8db683
commit 78672ecf4c
18 changed files with 33 additions and 113 deletions
Download Patch File Download Diff File Expand all files Collapse all files
html/css/styles.css
+2 -1
View File
@@ -1,6 +1,7 @@
.submit { .submit {
background-image:url('/images/submitbg.png'); background-image:url('/images/submitbg.png');
background-position:0 100%; background-position:0 100%;
border-color:#B2B2B2 #525252 #525252 #B2B2B2;
} }
input,select { input,select {
padding:2px 5px; padding:2px 5px;
@@ -10,7 +11,7 @@ input,select {
border:1px solid #B2B2B2 border:1px solid #B2B2B2
bbackground-color:cornsilk; bbackground-color:cornsilk;
border:1px solid #B2B2B2; border:1px solid #B2B2B2;
bborder-color:#B2B2B2 #000000 #000000 #B2B2B2; border-color:#B2B2B2 #d2d2d2 #d2d2d2 #B2B2B2;
border-style:solid; border-style:solid;
border-width:1px; border-width:1px;
font-family:'Trebuchet MS','Lucida Grande',Verdana,Arial,sans-serif; font-family:'Trebuchet MS','Lucida Grande',Verdana,Arial,sans-serif;
html/pages/addhost.php
+1 -1
View File
@@ -52,7 +52,7 @@ echo("<p class='errorbox'><b>Error:</b> A hostname is required.</p>");
</td> </td>
</tr> </tr>
<tr> <tr>
<td></td><td><input type="submit" name="Submit" value="Add Host"></td> <td></td><td><input type="submit" class="submit" name="Submit" value="Add Host"></td>
</tr> </tr>
</table> </table>
</div> </div>
html/pages/bills.php
+1 -1
View File
@@ -46,7 +46,7 @@ print_optionbar_start('40');
</select> </select>
</td> </td>
<td> <td>
<input type=submit value=Search> <input type=submit class=submit value=Search>
</td> </td>
<td width='80' style='font-weight:bold; font-size: 12px;'> <td width='80' style='font-weight:bold; font-size: 12px;'>
<a href='bills/add/'><img src="images/16/add.png" align=absmiddle alt="Add"> Add Bill</a> <a href='bills/add/'><img src="images/16/add.png" align=absmiddle alt="Add"> Add Bill</a>
html/pages/delhost.php
+1 -1
View File
@@ -30,7 +30,7 @@ while($data = mysql_fetch_array($query)) {
?> ?>
</select> </select>
<input type="submit" name="Submit" value="Delete Host"> <input type="submit" class="submit" name="Submit" value="Delete Host">
</p> </p>
</form> </form>
html/pages/device/ciscosensors.inc.php
+4 -21
View File
@@ -1,15 +1,6 @@
<?php // vim:fenc=utf-8:filetype=php:ts=4 <?php
echo("<div style='margin:auto; text-align: center; margin-top: 0px; margin-bottom: 10px;'> print_optionbar_start();
<b class='rounded'>
<b class='rounded1'></b>
<b class='rounded2'></b>
<b class='rounded3'></b>
<b class='rounded4'></b>
<b class='rounded5'></b></b>
<div class='roundedfg' style='padding: 0px 5px;'>
<div style='margin: auto; text-align: left; padding: 2px 5px; padding-left: 11px; clear: both; display:block; height:20px;'>
");
unset ($sep); unset ($sep);
$query = mysql_query("SELECT `entSensorType` FROM `entPhysical` WHERE device_id = '".$device['device_id']."' AND entSensorType != '' AND entSensorType NOT LIKE 'No%' GROUP BY `entSensorType` ORDER BY `entSensorType`"); $query = mysql_query("SELECT `entSensorType` FROM `entPhysical` WHERE device_id = '".$device['device_id']."' AND entSensorType != '' AND entSensorType NOT LIKE 'No%' GROUP BY `entSensorType` ORDER BY `entSensorType`");
@@ -23,16 +14,8 @@ echo("<div style='margin:auto; text-align: center; margin-top: 0px; margin-botto
$sep = ' | '; $sep = ' | ';
} }
unset ($sep); unset ($sep);
echo("</div>
</div> print_optionbar_end();
<b class='rounded'>
<b class='rounded5'></b>
<b class='rounded4'></b>
<b class='rounded3'></b>
<b class='rounded2'></b>
<b class='rounded1'></b></b>
</div>
");
$query = mysql_query("SELECT * FROM `entPhysical` WHERE device_id = '".$device['device_id']."' and entSensorType = '".$_GET['opta']."' ORDER BY `entPhysicalName`"); $query = mysql_query("SELECT * FROM `entPhysical` WHERE device_id = '".$device['device_id']."' and entSensorType = '".$_GET['opta']."' ORDER BY `entPhysicalName`");
while($data = mysql_fetch_array($query)) { while($data = mysql_fetch_array($query)) {
html/pages/device/health.inc.php
+1 -14
View File
@@ -1,4 +1,4 @@
<?php // vim:fenc=utf-8:filetype=php:ts=4 <?php
$temp = mysql_result(mysql_query("select count(*) from temperature WHERE temp_host = '" . $device['device_id'] . "'"), 0); $temp = mysql_result(mysql_query("select count(*) from temperature WHERE temp_host = '" . $device['device_id'] . "'"), 0);
$storage = mysql_result(mysql_query("select count(*) from storage WHERE host_id = '" . $device['device_id'] . "'"), 0); $storage = mysql_result(mysql_query("select count(*) from storage WHERE host_id = '" . $device['device_id'] . "'"), 0);
@@ -23,19 +23,6 @@ $type_text['storage'] = "Disk Usage";
$type_text['hrprocessors'] = "Processor Usage"; $type_text['hrprocessors'] = "Processor Usage";
/*
echo("<div style='margin:auto; text-align: center; margin-top: 0px; margin-bottom: 10px;'>
<b class='rounded'>
<b class='rounded1'></b>
<b class='rounded2'></b>
<b class='rounded3'></b>
<b class='rounded4'></b>
<b class='rounded5'></b></b>
<div class='roundedfg' style='padding: 0px 5px;'>
<div style='margin: auto; text-align: left; padding: 2px 5px; padding-left: 11px; clear: both; display:block; height:20px;'>
");
*/
print_optionbar_start(); print_optionbar_start();
unset ($sep); unset ($sep);
html/pages/device/syslog.inc.php
+1 -1
View File
@@ -22,7 +22,7 @@ print_optionbar_start('25');
?> ?>
</select> </select>
</label> </label>
<input type=submit value=Search> <input class=submit type=submit value=Search>
</form> </form>
<?php <?php
html/pages/device/vlans.inc.php
+6 -21
View File
@@ -1,31 +1,16 @@
<?php <?php
echo(" print_optionbar_start();
<div style='margin:auto; text-align: center; margin-top: 0px; margin-bottom: 0px;'>
<b class='rounded'> echo("<div style='margin: auto; text-align: left; padding: 2px 5px; padding-left: 11px; clear: both; display:block; height:20px;'>
<b class='rounded1'></b>
<b class='rounded2'></b>
<b class='rounded3'></b>
<b class='rounded4'></b>
<b class='rounded5'></b></b>
<div class='roundedfg' style='padding: 0px 5px;'>
<div style='margin: auto; text-align: left; padding: 2px 5px; padding-left: 11px; clear: both; display:block; height:20px;'>
<a href='".$config['base_url']."/device/" . $device['device_id'] . "/vlans/'>Basic</a> | Graphs : <a href='".$config['base_url']."/device/" . $device['device_id'] . "/vlans/'>Basic</a> | Graphs :
<a href='".$config['base_url']."/device/" . $device['device_id'] . "/vlans/bits/'>Bits</a> | <a href='".$config['base_url']."/device/" . $device['device_id'] . "/vlans/bits/'>Bits</a> |
<a href='".$config['base_url']."/device/" . $device['device_id'] . "/vlans/pkts/'>Packets</a> | <a href='".$config['base_url']."/device/" . $device['device_id'] . "/vlans/pkts/'>Packets</a> |
<a href='".$config['base_url']."/device/" . $device['device_id'] . "/vlans/nupkts/'>NU Packets</a> | <a href='".$config['base_url']."/device/" . $device['device_id'] . "/vlans/nupkts/'>NU Packets</a> |
<a href='".$config['base_url']."/device/" . $device['device_id'] . "/vlans/errors/'>Errors</a> <a href='".$config['base_url']."/device/" . $device['device_id'] . "/vlans/errors/'>Errors</a> ");
</div>
</div> print_optionbar_end();
<b class='rounded'>
<b class='rounded5'></b>
<b class='rounded4'></b>
<b class='rounded3'></b>
<b class='rounded2'></b>
<b class='rounded1'></b></b>
</div>
");
echo("<table border=0 cellspacing=0 cellpadding=5 width=100%>"); echo("<table border=0 cellspacing=0 cellpadding=5 width=100%>");
$i = "1"; $i = "1";
html/pages/devices.php
+1 -1
View File
@@ -88,7 +88,7 @@
} }
?> ?>
</select> </select>
<input class="submit" type="submit" value="Search"> <input class="submit" type="submit" class="submit" value="Search">
</td> </td>
<td width="10"></td> <td width="10"></td>
</tr> </tr>
html/pages/interfaces.php
+1 -1
View File
@@ -67,7 +67,7 @@
Deleted <input type=checkbox id="deleted" name="deleted" value=1 <?php if($_POST['deleted']) { echo("checked"); } ?> ></input> Deleted <input type=checkbox id="deleted" name="deleted" value=1 <?php if($_POST['deleted']) { echo("checked"); } ?> ></input>
</td> </td>
<td style="text-align: right;"> <td style="text-align: right;">
<input style="align:right;" type=submit value=Search></div> <input style="align:right;" type=submit class=submit value=Search></div>
</td> </td>
</form> </form>
</tr> </tr>
html/pages/inventory.php
+1 -1
View File
@@ -39,7 +39,7 @@
</select> </select>
</label> </label>
<input type="text" size=24 name="device_string" id="device_string" value="<?php echo($_POST['device_string']); ?>" /> <input type="text" size=24 name="device_string" id="device_string" value="<?php echo($_POST['device_string']); ?>" />
<input style type=submit value=Search> <input style type=submit class=submit value=Search>
<?php <?php
html/pages/ipv4.php
+4 -21
View File
@@ -1,12 +1,4 @@
<div style='margin:auto; text-align: center; margin-top: 0px; margin-bottom: 10px;'> <?php print_optionbar_start(28); ?>
<b class='rounded'>
<b class='rounded1'></b>
<b class='rounded2'></b>
<b class='rounded3'></b>
<b class='rounded4'></b>
<b class='rounded5'></b></b>
<div class='roundedfg' style='padding: 0px 5px;'>
<div style='margin: auto; text-align: left; padding: 5px 5px; padding-left: 10px; clear: both; display:block;'>
<table cellpadding=0 cellspacing=0 class=devicetable width=100%> <table cellpadding=0 cellspacing=0 class=devicetable width=100%>
<tr> <tr>
@@ -35,25 +27,16 @@
</td> </td>
<td width=400> <td width=400>
<input type="text" name="address" id="address" size=40 value="<?php echo($_POST['address']); ?>" /> <input type="text" name="address" id="address" size=40 value="<?php echo($_POST['address']); ?>" />
<input style="align:right;" type=submit value=Search></div> <input style="align:right;" type=submit class=submit value=Search></div>
</td> </td>
</form> </form>
</tr> </tr>
</table> </table>
</div>
</div>
<b class='rounded'>
<b class='rounded5'></b>
<b class='rounded4'></b>
<b class='rounded3'></b>
<b class='rounded2'></b>
<b class='rounded1'></b></b>
</div>
<?php <?php
print_optionbar_end();
echo("<table width=100% cellspacing=0 cellpadding=2>"); echo("<table width=100% cellspacing=0 cellpadding=2>");
if($_POST['device_id']) { $where .= " AND I.device_id = '".$_POST['device_id']."'"; } if($_POST['device_id']) { $where .= " AND I.device_id = '".$_POST['device_id']."'"; }
html/pages/ipv6.php
+4 -19
View File
@@ -1,12 +1,5 @@
<div style='margin:auto; text-align: center; margin-top: 0px; margin-bottom: 10px;'> <?php print_optionbar_start(28); ?>
<b class='rounded'>
<b class='rounded1'></b>
<b class='rounded2'></b>
<b class='rounded3'></b>
<b class='rounded4'></b>
<b class='rounded5'></b></b>
<div class='roundedfg' style='padding: 0px 5px;'>
<div style='margin: auto; text-align: left; padding: 5px 5px; padding-left: 10px; clear: both; display:block;'>
<table cellpadding=0 cellspacing=0 class=devicetable width=100%> <table cellpadding=0 cellspacing=0 class=devicetable width=100%>
<tr> <tr>
<form method='post' action=''> <form method='post' action=''>
@@ -34,22 +27,14 @@
</td> </td>
<td width=400> <td width=400>
<input type="text" name="address" id="address" size=40 value="<?php echo($_POST['address']); ?>" /> <input type="text" name="address" id="address" size=40 value="<?php echo($_POST['address']); ?>" />
<input style="align:right;" type=submit value=Search></div> <input style="align:right;" type=submit class=submit value=Search></div>
</td> </td>
</form> </form>
</tr> </tr>
</table> </table>
</div> <?php print_optionbar_end(); ?>
</div>
<b class='rounded'>
<b class='rounded5'></b>
<b class='rounded4'></b>
<b class='rounded3'></b>
<b class='rounded2'></b>
<b class='rounded1'></b></b>
</div>
<?php <?php
html/pages/logon.inc
+2 -2
View File
@@ -21,7 +21,7 @@
<font size="2">Remember Me</font></td> <font size="2">Remember Me</font></td>
</tr> </tr>
<tr> <tr>
<td colspan="2" align="right"><input name="submit" type="submit" value="Login" /></td> <td colspan="2" align="right"><input class="submit" name="submit" type="submit" value="Login" /></td>
</tr> </tr>
<?php <?php
if($auth_message) { if($auth_message) {
@@ -46,4 +46,4 @@ if($config['login_message']) {
<!-- <!--
document.logonform.username.focus(); document.logonform.username.focus();
// --> // -->
</script> </script>
html/pages/preferences.php
+1 -1
View File
@@ -19,7 +19,7 @@ echo("<form method='post' action='".$config['baseurl']."/preferences/'><input ty
<tr><td>Old Password</td><td><input type=password name=old_pass autocomplete='off'></input></td></tr> <tr><td>Old Password</td><td><input type=password name=old_pass autocomplete='off'></input></td></tr>
<tr><td>New Password</td><td><input type=password name=new_pass autocomplete='off'></input></td></tr> <tr><td>New Password</td><td><input type=password name=new_pass autocomplete='off'></input></td></tr>
<tr><td>New Password</td><td><input type=password name=new_pass2 autocomplete='off'></input></td></tr> <tr><td>New Password</td><td><input type=password name=new_pass2 autocomplete='off'></input></td></tr>
<tr><td></td><td align=right><input type=submit></td></tr></table></form>"); <tr><td></td><td align=right><input type=submit class=submit></td></tr></table></form>");
echo("</div>"); echo("</div>");
html/pages/syslog.php
+1 -1
View File
@@ -37,7 +37,7 @@
</select> </select>
</label> </label>
<input type=submit value=Search> <input type=submit class=submit value=Search>
</form> </form>
includes/discovery/temperatures.php
+1
View File
@@ -116,6 +116,7 @@
## LMSensors Temperatures ## LMSensors Temperatures
if($device['os'] == "linux") { if($device['os'] == "linux") {
$oids = shell_exec($config['snmpwalk'] . " -m LM-SENSORS-MIB -$snmpver -CI -Osqn -c $community $hostname:$port lmTempSensorsDevice"); $oids = shell_exec($config['snmpwalk'] . " -m LM-SENSORS-MIB -$snmpver -CI -Osqn -c $community $hostname:$port lmTempSensorsDevice");
if($debug) { echo($oids."\n"); }
$oids = trim($oids); $oids = trim($oids);
if ($oids) echo("LM-SENSORS "); if ($oids) echo("LM-SENSORS ");
foreach(explode("\n", $oids) as $data) { foreach(explode("\n", $oids) as $data) {
process-syslog.php
-5
View File
@@ -22,13 +22,10 @@ include("includes/syslog.php");
#mysql_query("DELETE FROM `syslog` WHERE `processed` = '0' AND `msg` LIKE '%PM-3-INVALID_BRIDGE_PORT%'"); #mysql_query("DELETE FROM `syslog` WHERE `processed` = '0' AND `msg` LIKE '%PM-3-INVALID_BRIDGE_PORT%'");
#mysql_query("DELETE FROM `syslog` WHERE `processed` = '0' AND `msg` LIKE '%RHWatchdog%'"); #mysql_query("DELETE FROM `syslog` WHERE `processed` = '0' AND `msg` LIKE '%RHWatchdog%'");
#mysql_query("DELETE FROM `syslog` WHERE `processed` = '0' AND `msg` LIKE '%Hardware Monitoring%'"); #mysql_query("DELETE FROM `syslog` WHERE `processed` = '0' AND `msg` LIKE '%Hardware Monitoring%'");
#mysql_query("DELETE FROM `syslog` WHERE `program` LIKE 'SNMP-3-AUTHFAIL'"); #mysql_query("DELETE FROM `syslog` WHERE `program` LIKE 'SNMP-3-AUTHFAIL'");
#mysql_query("DELETE FROM `syslog` WHERE `program` LIKE 'SW_MATM-4-MACFLAP_NOTIF'"); #mysql_query("DELETE FROM `syslog` WHERE `program` LIKE 'SW_MATM-4-MACFLAP_NOTIF'");
#mysql_query("DELETE FROM `syslog` WHERE `priority` = 'debug'"); #mysql_query("DELETE FROM `syslog` WHERE `priority` = 'debug'");
## Delete all the old old old syslogs (as per config.php variable) ## Delete all the old old old syslogs (as per config.php variable)
mysql_query("DELETE FROM `syslog` WHERE `datetime` < DATE_SUB(NOW(), INTERVAL ".$config['syslog_age'].")"); mysql_query("DELETE FROM `syslog` WHERE `datetime` < DATE_SUB(NOW(), INTERVAL ".$config['syslog_age'].")");
@@ -36,8 +33,6 @@ mysql_query("DELETE FROM `syslog` WHERE `datetime` < DATE_SUB(NOW(), INTERVAL ".
$q = mysql_query("SELECT * FROM `syslog` where `processed` = '0'"); $q = mysql_query("SELECT * FROM `syslog` where `processed` = '0'");
while($entry = mysql_fetch_array($q)){ while($entry = mysql_fetch_array($q)){
print_r($entry);
process_syslog($entry, 1); process_syslog($entry, 1);