summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--modules-available/roomplanner/clientscript.js4
-rw-r--r--modules-available/roomplanner/js/grid.js12
-rw-r--r--modules-available/roomplanner/js/init.js18
-rw-r--r--modules-available/roomplanner/style.css30
-rw-r--r--modules-available/serversetup-bwlp-ipxe/page.inc.php7
-rw-r--r--modules-available/serversetup-bwlp-ipxe/templates/bootentry-list.html2
-rw-r--r--modules-available/statistics/inc/filter.inc.php37
-rw-r--r--modules-available/statistics/page.inc.php10
8 files changed, 17 insertions, 103 deletions
diff --git a/modules-available/roomplanner/clientscript.js b/modules-available/roomplanner/clientscript.js
index 826935a3..823c212a 100644
--- a/modules-available/roomplanner/clientscript.js
+++ b/modules-available/roomplanner/clientscript.js
@@ -48,9 +48,9 @@ function renderMachineEntry(item, escape) {
+ ' <div class="machine-body">'
+ ' <div class="machine-entry-header"> ' + escape(item.hostname) + extraText + '</div>'
+ ' <table>'
- + '<tr><td>IP: </td> <td>' + escape(item.clientip) + '</td></tr>'
- + '<tr><td>MAC: </td> <td>' + escape(item.macaddr) + '</td></tr>'
+ '<tr><td>UUID:</td> <td>' + escape(item.machineuuid) + '</td></tr>'
+ + '<tr><td>MAC: </td> <td>' + escape(item.macaddr) + '</td></tr>'
+ + '<tr><td>IP: </td> <td>' + escape(item.clientip) + '</td></tr>'
+ ' </table>'
+ ' </div>'
+ '</div>';
diff --git a/modules-available/roomplanner/js/grid.js b/modules-available/roomplanner/js/grid.js
index 80789963..697d7c3f 100644
--- a/modules-available/roomplanner/js/grid.js
+++ b/modules-available/roomplanner/js/grid.js
@@ -125,18 +125,10 @@ if (!roomplanner) var roomplanner = {
},
initTooltip: function(el) {
if ($(el).attr('itemtype') === 'pc') {
- var tip = '<div class="table">';
+ var tip = "<b>Rechnerdaten</b><br>";
$(roomplanner.computerAttributes).each(function(i,key){
- if (key === 'hostname') {
- tip += '<div class="tc">' + $(el).attr(key) + '</div>';
- return;
- }
- tip += '<div class="tr">';
- tip += '<div class="td">' + __(key) + ": " + '</div>';
- tip += '<div class="td">' + $(el).attr(key) + '</div>';
- tip += '</div>';
+ tip += __(key)+": "+$(el).attr(key)+"<br>";
});
- tip += '</div>';
$(el).attr('title', tip).attr('data-toggle', 'tooltip');
$(el).tooltip({html: true, container: 'body'});
diff --git a/modules-available/roomplanner/js/init.js b/modules-available/roomplanner/js/init.js
index 79f8e17e..7cada0dd 100644
--- a/modules-available/roomplanner/js/init.js
+++ b/modules-available/roomplanner/js/init.js
@@ -6,10 +6,10 @@ function initRoomplanner() {
$('#drawarea').css('left',(-roomplanner.settings.scale*10)+'px');
roomplanner.computerAttributes = [
- "hostname",
- "ip",
- "mac_address",
- "muuid"
+ "muuid",
+ "mac_address",
+ "ip",
+ "hostname"
];
$("#loadButton").click(function() {
@@ -66,11 +66,11 @@ function initRoomplanner() {
}
var translation = {
- "muuid" : "UUID",
- "mac_address" : "MAC",
- "ip" : "IP",
- "hostname": "Hostname",
-
+ "muuid" : "Machine UUID",
+ "mac_address" : "MAC Adresse",
+ "ip" : "IP Adresse",
+ "hostname": "Rechnername",
+
"wall-horizontal" : "Wand (horizontal)",
"wall-vertical" : "Mauer (vertikal)",
"window-horizontal" : "Fenster",
diff --git a/modules-available/roomplanner/style.css b/modules-available/roomplanner/style.css
index 5e8bc25c..f1dd994a 100644
--- a/modules-available/roomplanner/style.css
+++ b/modules-available/roomplanner/style.css
@@ -769,33 +769,3 @@ div.ui-draggable:hover > .pcHandle {
max-height : 600px;
}
-.tooltip > .tooltip-inner {
- color: #FFFFFF;
- text-align: left;
- max-width: 500px;
-}
-
-div.table {
- display: table;
- border-collapse:collapse;
- text-align: left;
- margin-bottom: 10px;
-}
-
-div.tr {
- display:table-row;
- border-top: 1px solid #bbb;
- border-bottom: 1px solid #bbb;
-}
-
-div.td {
- display:table-cell;
- padding: 2px;
-}
-
-div.tc {
- display:table-caption;
- font-weight: bold;
- font-size: 16px;
- padding-bottom: 5px;
-}
diff --git a/modules-available/serversetup-bwlp-ipxe/page.inc.php b/modules-available/serversetup-bwlp-ipxe/page.inc.php
index 56b41d4e..6a874775 100644
--- a/modules-available/serversetup-bwlp-ipxe/page.inc.php
+++ b/modules-available/serversetup-bwlp-ipxe/page.inc.php
@@ -298,11 +298,8 @@ class Page_ServerSetup extends Page
{
$allowEdit = User::hasPermission('ipxe.bootentry.edit');
- $res = Database::simpleQuery("SELECT be.entryid, be.hotkey, be.title, be.builtin, Count(sme.menuid) AS refs,
- GROUP_CONCAT(sm.title SEPARATOR ', ') as menuname
- FROM serversetup_bootentry be
- LEFT JOIN serversetup_menuentry sme USING (entryid)
- LEFT JOIN serversetup_menu sm USING (menuid)
+ $res = Database::simpleQuery("SELECT be.entryid, be.hotkey, be.title, be.builtin, Count(sm.menuid) AS refs FROM serversetup_bootentry be
+ LEFT JOIN serversetup_menuentry sm USING (entryid)
GROUP BY be.entryid
ORDER BY be.title ASC");
$bootentryTable = [];
diff --git a/modules-available/serversetup-bwlp-ipxe/templates/bootentry-list.html b/modules-available/serversetup-bwlp-ipxe/templates/bootentry-list.html
index 4044c666..dfc4e6a8 100644
--- a/modules-available/serversetup-bwlp-ipxe/templates/bootentry-list.html
+++ b/modules-available/serversetup-bwlp-ipxe/templates/bootentry-list.html
@@ -33,7 +33,7 @@
</td>
<td align="right">
{{#refs}}
- <span class="badge" data-toggle="tooltip" data-placement="top" title="{{menuname}}">{{refs}}</span>
+ <span class="badge">{{refs}}</span>
{{/refs}}
</td>
<td align="center">
diff --git a/modules-available/statistics/inc/filter.inc.php b/modules-available/statistics/inc/filter.inc.php
index 8f61e44b..46de467b 100644
--- a/modules-available/statistics/inc/filter.inc.php
+++ b/modules-available/statistics/inc/filter.inc.php
@@ -106,14 +106,6 @@ class Filter
$filters[] = new LocationFilter($operator, $rhs);
} elseif ($lhs === 'subnet') {
$filters[] = new SubnetFilter($operator, $rhs);
- } elseif ($lhs === 'lastboot') {
- $filters[] = new ByDateFilter($operator, $rhs, $lhs);
- } elseif ($lhs === 'firstseen') {
- $filters[] = new ByDateFilter($operator, $rhs, $lhs);
- } elseif ($lhs === 'lastseen') {
- $filters[] = new ByDateFilter($operator, $rhs, $lhs);
- } elseif ($lhs === 'logintime') {
- $filters[] = new ByDateFilter($operator, $rhs, $lhs);
} else {
if (array_key_exists($lhs, Page_Statistics::$columns) && Page_Statistics::$columns[$lhs]['column']) {
$filters[] = new Filter($lhs, $operator, $rhs);
@@ -168,6 +160,7 @@ class RuntimeFilter extends Filter
public function whereClause(&$args, &$joins)
{
+ global $SIZE_RAM;
$upper = time() - (int)$this->argument * 3600;
$lower = $upper - 3600;
$common = "state IN ('OCCUPIED', 'IDLE', 'STANDBY') AND";
@@ -190,34 +183,6 @@ class RuntimeFilter extends Filter
}
}
-class ByDateFilter extends Filter
-{
- public function __construct($operator, $argument, $filter)
- {
- parent::__construct($filter, $operator, $argument);
- }
-
- public function whereClause(&$args, &$joins)
- {
- if ($this->operator == '=') {
- return " DATE(FROM_UNIXTIME($this->column)) = '$this->argument'";
- } elseif ($this->operator == '<') {
- return " DATE(FROM_UNIXTIME($this->column)) < '$this->argument'";
- } elseif ($this->operator == '<=') {
- return " DATE(FROM_UNIXTIME($this->column)) <= '$this->argument'";
- } elseif ($this->operator == '>') {
- return " DATE(FROM_UNIXTIME($this->column)) > '$this->argument'";
- } elseif ($this->operator == '>=') {
- return " DATE(FROM_UNIXTIME($this->column)) >= '$this->argument'";
- } elseif ($this->operator == '!=') {
- return " DATE(FROM_UNIXTIME($this->column)) != '$this->argument'";
- } else {
- error_log("unimplemented operator in ByDateFilter: $this->operator");
- return ' 1';
- }
- }
-}
-
class Id44Filter extends Filter
{
public function __construct($operator, $argument)
diff --git a/modules-available/statistics/page.inc.php b/modules-available/statistics/page.inc.php
index bc5726ef..c5da85fe 100644
--- a/modules-available/statistics/page.inc.php
+++ b/modules-available/statistics/page.inc.php
@@ -137,16 +137,6 @@ class Page_Statistics extends Page
'type' => 'int',
'column' => true
],
- 'runtime' => [
- 'op' => Page_Statistics::OP_ORDINAL,
- 'type' => 'int',
- 'column' => true
- ],
- 'lastboot' => [
- 'op' => Page_Statistics::OP_ORDINAL,
- 'type' => 'date',
- 'column' => true
- ],
];
if (Module::isAvailable('locations')) {
Page_Statistics::$columns['location'] = [