From 4c39ec1b183f305f228f70d65dfd0c9190d1cbbf Mon Sep 17 00:00:00 2001
From: Christian Klinger
Date: Fri, 26 Aug 2016 10:36:21 +0200
Subject: minor improvements including #2970.

---
 modules-available/roomplanner/clientscript.js         | 3 +++
 modules-available/roomplanner/style.css               | 2 +-
 modules-available/roomplanner/templates/page.html     | 2 +-
 modules-available/statistics/templates/filterbox.html | 2 +-
 4 files changed, 6 insertions(+), 3 deletions(-)

(limited to 'modules-available')

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>
diff --git a/modules-available/statistics/templates/filterbox.html b/modules-available/statistics/templates/filterbox.html
index 544d1c48..c6f6bbd7 100644
--- a/modules-available/statistics/templates/filterbox.html
+++ b/modules-available/statistics/templates/filterbox.html
@@ -30,7 +30,6 @@
 	<!-- use GET here, to avoid the "resend form?" confirmation, and anyway this is stateless, so GET makes more sense -->
 	<form id="queryForm" method="GET" action="?do=Statistics" class="" role="form">
 		<input type="hidden" name="do" value="statistics">
-		<input type="hidden" name="show" value="{{show}}">
 		<label for="filterInput">{{lang_labelFilter}}</label>
 		<input type="text" name="filters" class="" id="filterInput"/>
 		<input type="hidden" name="sortColumn" id="sortColumn" value="{{sortColumn}}"/>
@@ -50,6 +49,7 @@
 				{{lang_showList}}
 			</button>
 		</div>
+		<input type="hidden" name="show" value="{{show}}">
 	</form>
 	<br/>
 	<br/>
-- 
cgit v1.2.3-55-g7522