summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimon Rettberg2016-12-07 14:56:37 +0100
committerSimon Rettberg2016-12-07 14:56:37 +0100
commit77166978b27b9eb671c905db5f98dbfed47de768 (patch)
treedba53261d035af8413b0696ad9d197b40f6914fe
parent[sysconfig] remove broken quotation when listing the content of a config (diff)
downloadslx-admin-77166978b27b9eb671c905db5f98dbfed47de768.tar.gz
slx-admin-77166978b27b9eb671c905db5f98dbfed47de768.tar.xz
slx-admin-77166978b27b9eb671c905db5f98dbfed47de768.zip
[roomplanner] Fix clipped tooltips, add border to PCs
-rw-r--r--modules-available/roomplanner/js/grid.js6
-rw-r--r--modules-available/roomplanner/style.css13
2 files changed, 8 insertions, 11 deletions
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 = "<b>Rechnerdaten</b><br>";
$(roomplanner.computerAttributes).each(function(i,key){
tip += __(key)+": "+$(el).attr(key)+"<br>";
});
- $(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;
}