diff options
| author | Christian Klinger | 2016-08-26 10:36:21 +0200 |
|---|---|---|
| committer | Christian Klinger | 2016-08-26 10:36:21 +0200 |
| commit | 4c39ec1b183f305f228f70d65dfd0c9190d1cbbf (patch) | |
| tree | 4b117f7b0df7066aba0ba110672e154fd53ca758 /modules-available/roomplanner | |
| parent | added "Zurück"-Buttons to each add-module page. (diff) | |
| download | slx-admin-4c39ec1b183f305f228f70d65dfd0c9190d1cbbf.tar.gz slx-admin-4c39ec1b183f305f228f70d65dfd0c9190d1cbbf.tar.xz slx-admin-4c39ec1b183f305f228f70d65dfd0c9190d1cbbf.zip | |
minor improvements including #2970.
Diffstat (limited to 'modules-available/roomplanner')
| -rw-r--r-- | modules-available/roomplanner/clientscript.js | 3 | ||||
| -rw-r--r-- | modules-available/roomplanner/style.css | 2 | ||||
| -rw-r--r-- | modules-available/roomplanner/templates/page.html | 2 |
3 files changed, 5 insertions, 2 deletions
diff --git a/modules-available/roomplanner/clientscript.js b/modules-available/roomplanner/clientscript.js index 25495995..1b184753 100644 --- a/modules-available/roomplanner/clientscript.js +++ b/modules-available/roomplanner/clientscript.js @@ -135,5 +135,8 @@ function selectMachine(usedUuids, callback) { currentCallback = callback; placedMachines = usedUuids; $modal.modal('show'); + $modal.one('hidden.bs.modal', function () { + currentCallback(false); + }); } diff --git a/modules-available/roomplanner/style.css b/modules-available/roomplanner/style.css index 1e434237..b04048bd 100644 --- a/modules-available/roomplanner/style.css +++ b/modules-available/roomplanner/style.css @@ -29,7 +29,7 @@ body.full #drawpanel { bottom: 5px; right: 30px; width: 15%; - z-index: 10000;} + } #scaleslider { position:relative;} diff --git a/modules-available/roomplanner/templates/page.html b/modules-available/roomplanner/templates/page.html index a531e57f..262d7947 100644 --- a/modules-available/roomplanner/templates/page.html +++ b/modules-available/roomplanner/templates/page.html @@ -34,7 +34,7 @@ </div> <div class="modal-footer"> - <button class="btn btn-default pull-left">{{lang_cancel}}</button> + <button class="btn btn-default pull-left" data-dismiss="modal" >{{lang_cancel}}</button> <button class="btn btn-primary" id="selectMachineButton">{{lang_select}}</button> </div> </div> |