diff options
author | Steffen Ritter | 2019-07-19 11:52:33 +0200 |
---|---|---|
committer | Steffen Ritter | 2019-12-17 13:50:06 +0100 |
commit | 67b4e451a1517cc8fae71df243878abd7bf914d6 (patch) | |
tree | 22b23b1c8e9ad283ddf5b07917e86c46397c8b87 /modules-available/roomplanner | |
parent | [inc/Trigger] Pass dnbd3 status to MountVmStore task (diff) | |
download | slx-admin-67b4e451a1517cc8fae71df243878abd7bf914d6.tar.gz slx-admin-67b4e451a1517cc8fae71df243878abd7bf914d6.tar.xz slx-admin-67b4e451a1517cc8fae71df243878abd7bf914d6.zip |
[roomplanner] Make client tooltip more readable
Diffstat (limited to 'modules-available/roomplanner')
-rw-r--r-- | modules-available/roomplanner/clientscript.js | 4 | ||||
-rw-r--r-- | modules-available/roomplanner/js/grid.js | 12 | ||||
-rw-r--r-- | modules-available/roomplanner/js/init.js | 18 | ||||
-rw-r--r-- | modules-available/roomplanner/style.css | 30 |
4 files changed, 51 insertions, 13 deletions
diff --git a/modules-available/roomplanner/clientscript.js b/modules-available/roomplanner/clientscript.js index 0ad14a25..45bbaa18 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 8f516465..0fe56ad6 100644 --- a/modules-available/roomplanner/style.css +++ b/modules-available/roomplanner/style.css @@ -804,3 +804,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; +} |