make roomplanner 100% even on big screens and fix bug.

2 files changed, 5 insertions, 2 deletions

diff --git a/modules-available/roomplanner/clientscript.js b/modules-available/roomplanner/clientscript.js
index 1b184753..f54434f2 100644
--- a/modules-available/roomplanner/clientscript.js
+++ b/modules-available/roomplanner/clientscript.js
@@ -123,6 +123,7 @@ function onBtnSelect() {
         var result = {muuid: value.machineuuid, ip: value.clientip, mac_address : value.macaddr, hostname: value.hostname};
 
         currentCallback(result);
+        currentCallback = null;
 
         $modal.modal('hide');
         clearSubnetBox();
@@ -136,7 +137,9 @@ function selectMachine(usedUuids, callback) {
     placedMachines =  usedUuids;
     $modal.modal('show');
     $modal.one('hidden.bs.modal', function () {
-        currentCallback(false);
+        if (currentCallback != null) {
+            currentCallback(false);
+        }
     });
 }
 
diff --git a/modules-available/roomplanner/js/init.js b/modules-available/roomplanner/js/init.js
index 87f6c831..1d3c18fb 100644
--- a/modules-available/roomplanner/js/init.js
+++ b/modules-available/roomplanner/js/init.js
@@ -6,7 +6,7 @@ function initRoomplanner() {
 
 	/* make it fullscreen, otherwise there are too many positioning bugs */
 	$('.sidebar-bg, .navbar').hide();
-	$('#mainpage').css('position', 'static').css('width', '100%').css('left', '0px');
+	$('#mainpage').css('position', 'static').css('width', '100%').css('max-width', '100%').css('left', '0px');
 
 
 	$('#drawarea').css('top',(-roomplanner.settings.scale*10)+'px');