diff options
| author | Christian Klinger | 2016-08-22 15:06:40 +0200 |
|---|---|---|
| committer | Christian Klinger | 2016-08-22 15:06:40 +0200 |
| commit | df6a641147701aab803df8d0b4ac072595ddae75 (patch) | |
| tree | e344e55d5e0bb9aa32230d22c208c4dbe7902cec /modules-available/roomplanner | |
| parent | just use fullscreen to mitigate the positioning bugs. (diff) | |
| download | slx-admin-df6a641147701aab803df8d0b4ac072595ddae75.tar.gz slx-admin-df6a641147701aab803df8d0b4ac072595ddae75.tar.xz slx-admin-df6a641147701aab803df8d0b4ac072595ddae75.zip | |
removed the tooltip plugin from jquery-ui.
jQuery-UI's tooltip() conflicted with the tooltip() function of
bootstrap which we want to use.
Diffstat (limited to 'modules-available/roomplanner')
| -rw-r--r-- | modules-available/roomplanner/js/grid.js | 5 | ||||
| -rw-r--r-- | modules-available/roomplanner/templates/page.html | 2 |
2 files changed, 3 insertions, 4 deletions
diff --git a/modules-available/roomplanner/js/grid.js b/modules-available/roomplanner/js/grid.js index 1b82f772..f0c18316 100644 --- a/modules-available/roomplanner/js/grid.js +++ b/modules-available/roomplanner/js/grid.js @@ -84,9 +84,8 @@ if (!roomplanner) var roomplanner = { $(roomplanner.computerAttributes).each(function(i,key){ tip += __(key)+": "+$(el).attr(key)+"<br>"; }); - - $(el).attr('data-togle','tooltip'); - $(el).attr('title',tip); + + $(el).attr('title', tip); $(el).tooltip({html: true}); } }, diff --git a/modules-available/roomplanner/templates/page.html b/modules-available/roomplanner/templates/page.html index d16769e8..a531e57f 100644 --- a/modules-available/roomplanner/templates/page.html +++ b/modules-available/roomplanner/templates/page.html @@ -324,7 +324,7 @@ </form> </div> </div> - <button id="saveBtn" class="btn btn-success">Save</button> + <button id="saveBtn" class="btn btn-success" onclick="window.close(); return false">Save</button> </body> </html> |