summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteffen Ritter2019-07-19 11:52:33 +0200
committerSteffen Ritter2019-07-19 11:52:33 +0200
commit101b12d912d241ef533080f980e61a6fb964141a (patch)
treea5bb9dbf0ac5f26418ee3afaebe74706e8b36cb4
parent[exams] Fix isExamMode() for global exams (diff)
downloadslx-admin-101b12d912d241ef533080f980e61a6fb964141a.tar.gz
slx-admin-101b12d912d241ef533080f980e61a6fb964141a.tar.xz
slx-admin-101b12d912d241ef533080f980e61a6fb964141a.zip
[roomplanner] Make client tooltip more readable
-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, 51 insertions, 13 deletions
diff --git a/modules-available/roomplanner/clientscript.js b/modules-available/roomplanner/clientscript.js
index 823c212a..826935a3 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>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>'
+ + '<tr><td>MAC: </td> <td>' + escape(item.macaddr) + '</td></tr>'
+ + '<tr><td>UUID:</td> <td>' + escape(item.machineuuid) + '</td></tr>'
+ ' </table>'
+ ' </div>'
+ '</div>';
diff --git a/modules-available/roomplanner/js/grid.js b/modules-available/roomplanner/js/grid.js
index 697d7c3f..80789963 100644
--- a/modules-available/roomplanner/js/grid.js
+++ b/modules-available/roomplanner/js/grid.js
@@ -125,10 +125,18 @@ if (!roomplanner) var roomplanner = {
},
initTooltip: function(el) {
if ($(el).attr('itemtype') === 'pc') {
- var tip = "<b>Rechnerdaten</b><br>";
+ var tip = '<div class="table">';
$(roomplanner.computerAttributes).each(function(i,key){
- tip += __(key)+": "+$(el).attr(key)+"<br>";
+ 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 += '</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 7cada0dd..79f8e17e 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 = [
- "muuid",
- "mac_address",
- "ip",
- "hostname"
+ "hostname",
+ "ip",
+ "mac_address",
+ "muuid"
];
$("#loadButton").click(function() {
@@ -66,11 +66,11 @@ function initRoomplanner() {
}
var translation = {
- "muuid" : "Machine UUID",
- "mac_address" : "MAC Adresse",
- "ip" : "IP Adresse",
- "hostname": "Rechnername",
-
+ "muuid" : "UUID",
+ "mac_address" : "MAC",
+ "ip" : "IP",
+ "hostname": "Hostname",
+
"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 f1dd994a..5e8bc25c 100644
--- a/modules-available/roomplanner/style.css
+++ b/modules-available/roomplanner/style.css
@@ -769,3 +769,33 @@ 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;
+}