From de224d94b5954d384a4e5b7b4b36ca350ed0d96c Mon Sep 17 00:00:00 2001
From: Steffen Ritter
Date: Tue, 17 Dec 2019 14:40:49 +0100
Subject: Revert "[roomplanner] Make client tooltip more readable"
This reverts commit 101b12d912d241ef533080f980e61a6fb964141a.
Was not included in 3.8b release
---
modules-available/roomplanner/clientscript.js | 4 ++--
modules-available/roomplanner/js/grid.js | 12 ++---------
modules-available/roomplanner/js/init.js | 18 ++++++++--------
modules-available/roomplanner/style.css | 30 ---------------------------
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) {
+ '
'
+ ' '
+ '
'
- + 'IP: | ' + escape(item.clientip) + ' |
'
- + 'MAC: | ' + escape(item.macaddr) + ' |
'
+ 'UUID: | ' + escape(item.machineuuid) + ' |
'
+ + 'MAC: | ' + escape(item.macaddr) + ' |
'
+ + 'IP: | ' + escape(item.clientip) + ' |
'
+ '
'
+ '
'
+ '';
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 = '';
+ var tip = "
Rechnerdaten";
$(roomplanner.computerAttributes).each(function(i,key){
- if (key === 'hostname') {
- tip += '
' + $(el).attr(key) + '
';
- return;
- }
- tip += '
';
- tip += '
' + __(key) + ": " + '
';
- tip += '
' + $(el).attr(key) + '
';
- tip += '
';
+ tip += __(key)+": "+$(el).attr(key)+"
";
});
- tip += '
';
$(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;
-}
--
cgit v1.2.3-55-g7522