[roomplanner] Make grid area higher, update slider when clicking (+) and (-)

4 files changed, 14 insertions, 12 deletions

diff --git a/modules-available/roomplanner/js/grid.js b/modules-available/roomplanner/js/grid.js
index 80273441..2ba1c7a1 100644
--- a/modules-available/roomplanner/js/grid.js
+++ b/modules-available/roomplanner/js/grid.js
@@ -404,16 +404,19 @@ roomplanner.grid = (function() {
 
 $(document).ready(function(){
 	roomplanner.grid.init();
+
+	var update = function(event,ui) {
+		roomplanner.grid.scale(ui.value);
+	};
 	
-	$('#scaleslider').slider({
+	roomplanner.slider = $('#scaleslider').slider({
 		orientation: "horizontal",
 		range: "min",
-		min: 20,
-		max: 200,
+		min: 50,
+		max: 150,
 		value: 100,
-		slide: function(event,ui) {
-			roomplanner.grid.scale(ui.value);
-		},
+		change: update,
+		slide: update,
 		stop: function(e, ui) {
 			$('#drawarea').trigger('checkposition');
 		}
diff --git a/modules-available/roomplanner/js/init.js b/modules-available/roomplanner/js/init.js
index bf102a91..2ff45cee 100644
--- a/modules-available/roomplanner/js/init.js
+++ b/modules-available/roomplanner/js/init.js
@@ -37,11 +37,11 @@ function initRoomplanner() {
 	});
 	
 	$('#zoom-out').click(function() {
-		roomplanner.grid.scale(roomplanner.settings.scale - 10);
+		roomplanner.slider.slider('value', roomplanner.settings.scale - 10);
 	});
 	
 	$('#zoom-in').click(function() {
-		roomplanner.grid.scale(roomplanner.settings.scale + 10);
+		roomplanner.slider.slider('value', roomplanner.settings.scale + 10);
 	});
 }
 
diff --git a/modules-available/roomplanner/style.css b/modules-available/roomplanner/style.css
index abf47fc4..a6e8a859 100644
--- a/modules-available/roomplanner/style.css
+++ b/modules-available/roomplanner/style.css
@@ -4,6 +4,7 @@
 
 body {
 	width: 100%;
+	height: 100%;
 	margin: 0;
 }
 
@@ -33,7 +34,8 @@ body {
 	padding:0;
 	margin: 0;
 	overflow: hidden;
-	height: 350px;}
+	height: 600px;
+}
 
 #scaleContainer {
 	position: absolute;
diff --git a/modules-available/roomplanner/templates/page.html b/modules-available/roomplanner/templates/page.html
index 344191d4..9d69eb9a 100644
--- a/modules-available/roomplanner/templates/page.html
+++ b/modules-available/roomplanner/templates/page.html
@@ -47,9 +47,6 @@
 <div class="alert alert-danger" style="display:none" id="error-msg"></div>
 
 	<div id="toolpanel" class="panel panel-default" style="z-index:200;">
-		<div class="panel-heading">
-			<h3 class="panel-title">Werkzeuge</h3>
-		</div>
 		<div class="panel-body">
 			<ul role="tablist" class="nav nav-tabs">
 				<li role="presentation" class="active"><a href="#computers"