diff options
Diffstat (limited to 'modules-available/roomplanner/js')
| -rw-r--r-- | modules-available/roomplanner/js/grid.js | 16 | ||||
| -rw-r--r-- | modules-available/roomplanner/js/init.js | 18 | ||||
| -rw-r--r-- | modules-available/roomplanner/js/lib/jquery-ui-draggable-collision.js | 4 |
3 files changed, 23 insertions, 15 deletions
diff --git a/modules-available/roomplanner/js/grid.js b/modules-available/roomplanner/js/grid.js index 697d7c3f..9157faa5 100644 --- a/modules-available/roomplanner/js/grid.js +++ b/modules-available/roomplanner/js/grid.js @@ -123,12 +123,20 @@ if (!roomplanner) var roomplanner = { }); } }, - initTooltip: function(el) { + initTooltip: function (el) { if ($(el).attr('itemtype') === 'pc') { - var tip = "<b>Rechnerdaten</b><br>"; - $(roomplanner.computerAttributes).each(function(i,key){ - tip += __(key)+": "+$(el).attr(key)+"<br>"; + var tip = '<table>'; + $(roomplanner.computerAttributes).each(function (i, key) { + tip += '<tr>'; + if (key === 'hostname') { + tip += '<td colspan="2">' + $(el).attr(key) + '</td>'; + } else { + tip += '<td>' + __(key) + ": " + '</td>'; + tip += '<td>' + $(el).attr(key) + '</td>'; + } + tip += '</tr>'; }); + tip += '</table>'; $(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/js/lib/jquery-ui-draggable-collision.js b/modules-available/roomplanner/js/lib/jquery-ui-draggable-collision.js index 3ef553b1..8aa351b9 100644 --- a/modules-available/roomplanner/js/lib/jquery-ui-draggable-collision.js +++ b/modules-available/roomplanner/js/lib/jquery-ui-draggable-collision.js @@ -377,7 +377,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // that the jquery-collision plugin takes into account during the calculations // * Also, the Coords() values get populated with these offsets at various times, so that they reflect "intended position" // - // Note also that the collider, obstacle, and direction data fields are temporarily overriden (because we need them here, + // Note also that the collider, obstacle, and direction data fields are temporarily overridden (because we need them here, // and the user may not have asked for them), and then erased and placed where the user wants them, right before // sending out the collision events // @@ -385,7 +385,7 @@ WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. // something relative, it has to get translated right before sending out the events... function handleCollide( event, ui ) { - // Note that $(this) is the draggable that's moving - it has a ui.position that moves acording to where + // Note that $(this) is the draggable that's moving - it has a ui.position that moves according to where // the draggable is "about to move". However, our "collidable" objects might not be the same as $(this) - // they might be child elements. So we need to keep track of recent and present position so we can apply the // "intended" dx and dy to all the moving elements: |