mirror/librenms-librenms
1
0
Fork 0
mirror of https://github.com/librenms/librenms.git synced 2024-10-07 16:52:45 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

webui: Added back devices sort by status (#8103)

Browse Source 
* added back sort by status

* removed useless html style tags
This commit is contained in:
crcro
2018-01-17 18:22:59 +02:00
committed by Neil Lathwood
parent df731c165c
commit e81413ac61
3 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
html/css/styles.css
View File

@@ -2129,11 +2129,11 @@ label {
}
.device-table-icon {
text-align: center;
display: block;
width: 70px;
height: 32px;
line-height: 32px;
padding-left:7px;
display: inline-block;
width: 64px;
height: 32px;
line-height: 32px;
}
.device-table-icon img {

1
html/includes/table/devices.inc.php
View File

@@ -141,7 +141,6 @@ foreach (dbFetchRows($sql, $param) as $device) {
if ($device['ignore'] == '1') {
$extra = 'label-default';
$msg = 'ignored';
if ($device['status'] == '1') {
$extra = 'label-warning';
}

12
html/pages/devices.inc.php
View File

@@ -371,10 +371,12 @@ if ($format == "graph") {
';
if ($subformat == "detail") {
echo '<th data-column-id="icon" data-width="80px" data-sortable="false" data-searchable="false" data-formatter="icon">Vendor</th>';
echo '<th data-column-id="status" data-formatter="status" data-width="7px" data-searchable="false">&nbsp;</th>';
echo '<th data-column-id="icon" data-width="70px" data-searchable="false" data-formatter="icon">Vendor</th>';
}
if ($subformat != "detail") {
echo '<th data-column-id="status" data-formatter="status" data-width="7px" data-searchable="false">&nbsp;</th>';
echo '<th data-column-id="hostname" data-order="asc" data-formatter="device">Device</th>';
} else {
echo '<th data-column-id="hostname" data-order="asc">Device</th>';
@@ -411,14 +413,14 @@ if ($format == "graph") {
rowCount: [50, 100, 250, -1],
columnSelection: true,
formatters: {
"msg": function (column, row) {
return "<span class=\"alert-status\">" + row.msg + "</span>";
"status": function (column, row) {
return "<span class=\"alert-status " + row.extra + "\"></span>";
},
"icon": function (column, row) {
return "<span class='alert-status " + row.extra + "' style='float:left;'></span><span class=\"device-table-icon\">" + row.icon + "</span>";
return "<span class=\"device-table-icon\">" + row.icon + "</span>";
},
"device": function (column, row) {
return "<span class='alert-status " + row.extra + "' style='float:left;margin-right:10px;'></span><span style=''>" + row.hostname + "</span>";
return "<span>" + row.hostname + "</span>";
},
},
templates: {