From 77166978b27b9eb671c905db5f98dbfed47de768 Mon Sep 17 00:00:00 2001 From: Simon Rettberg Date: Wed, 7 Dec 2016 14:56:37 +0100 Subject: [roomplanner] Fix clipped tooltips, add border to PCs --- modules-available/roomplanner/js/grid.js | 6 +++--- modules-available/roomplanner/style.css | 13 +++++-------- 2 files changed, 8 insertions(+), 11 deletions(-) (limited to 'modules-available/roomplanner') diff --git a/modules-available/roomplanner/js/grid.js b/modules-available/roomplanner/js/grid.js index 09e52099..cc09e21d 100644 --- a/modules-available/roomplanner/js/grid.js +++ b/modules-available/roomplanner/js/grid.js @@ -97,14 +97,14 @@ if (!roomplanner) var roomplanner = { }); }, initTooltip: function(el) { - if ($(el).attr('itemtype') == 'pc') { + if ($(el).attr('itemtype') === 'pc') { var tip = "Rechnerdaten
"; $(roomplanner.computerAttributes).each(function(i,key){ tip += __(key)+": "+$(el).attr(key)+"
"; }); - $(el).attr('title', tip); - $(el).tooltip({html: true}); + $(el).attr('title', tip).attr('data-toggle', 'tooltip'); + $(el).tooltip({html: true, container: 'body'}); } }, /** diff --git a/modules-available/roomplanner/style.css b/modules-available/roomplanner/style.css index 515fc56f..1460364a 100644 --- a/modules-available/roomplanner/style.css +++ b/modules-available/roomplanner/style.css @@ -65,9 +65,6 @@ body { right:-20px; } -[itemlook="computer"] { background: url('images/computer/computer.png') no-repeat;} - - [itemlook="door-nw"] { background: url('images/wall/door-nw.png') no-repeat;} [itemlook="door-ne"] { background: url('images/wall/door-ne.png') no-repeat;} [itemlook="door-sw"] { background: url('images/wall/door-sw.png') no-repeat;} @@ -81,12 +78,12 @@ body { background: url('images/electricalDevices_wIP/copier.png') no-repeat; } -/* -[itemlook="pc"] { - background: url('images/electricalDevices_wIP/pc.png') no-repeat; - z-index:100; + +[itemlook|="pc"] { + border: 1px solid #999; + border-radius: 4px; } -*/ + [itemlook="pc-east"] { background: url('images/electricalDevices_wIP/pc_east.png') no-repeat; } -- cgit v1.2.3-55-g7522