summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Ritter2019-12-17 14:40:49 +0100
committerSteffen Ritter2019-12-17 14:40:49 +0100
commitde224d94b5954d384a4e5b7b4b36ca350ed0d96c (patch)
treee323d416da888d3fd4e7b1e066f78dbb8065b07e
parent[statistics] Fix for shitty firefox (diff)
downloadslx-admin-de224d94b5954d384a4e5b7b4b36ca350ed0d96c.tar.gz
slx-admin-de224d94b5954d384a4e5b7b4b36ca350ed0d96c.tar.xz
slx-admin-de224d94b5954d384a4e5b7b4b36ca350ed0d96c.zip
Revert "[roomplanner] Make client tooltip more readable"
This reverts commit 101b12d912d241ef533080f980e61a6fb964141a. Was not included in 3.8b release
-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
4 files changed, 13 insertions, 51 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;
-}