Merge branch 'hotfix/error_report_button'

client/scripts/regatten.js.php

@@ -566,20 +566,7 @@ var onAfterSync = function() {
 	updateNewsBadge();
 }
 
-// Add console opener to preloader
+function sendErrorReport() {
-var addConsoleOpenerToPreloader = function() {
-	addConsoleOpenerToPreloader = function(){};
-	var preloader = document.getElementById('preloader');
-	var button = document.createElement('a');
-	button.id = 'button-show-console';
-	button.href = '#';
-	button.classList = 'btn rounded-s text-uppercase font-900 shadow-m m-3 bg-red2-dark bg-white';
-	button.style.position = 'fixed';
-	button.style.bottom = 0;
-	button.style.left = 0;
-	button.style.right = 0;
-	button.innerHTML = 'Fehlerbericht senden';
-	button.onclick = function(){
 	alert('FEHLERBERICHT\nEs wird jetzt ein Fehlerbericht an die Entwickler geschickt.\nBitte stelle sicher, dass Du mit dem Internet verbunden bist und drücke dann auf OK.');
 	$.ajax({
 		url: QUERY_URL + 'error_report',
@@ -601,6 +588,23 @@ var addConsoleOpenerToPreloader = function() {
 			location.href = 'https://github.com/ostertun/RegattenApp/issues/' + data.issueNumber;
 		}
 	});
+}
+
+// Add console opener to preloader
+var addConsoleOpenerToPreloader = function() {
+	addConsoleOpenerToPreloader = function(){};
+	var preloader = document.getElementById('preloader');
+	var button = document.createElement('a');
+	button.id = 'button-show-console';
+	button.href = '#';
+	button.classList = 'btn rounded-s text-uppercase font-900 shadow-m m-3 bg-red2-dark bg-white';
+	button.style.position = 'fixed';
+	button.style.bottom = 0;
+	button.style.left = 0;
+	button.style.right = 0;
+	button.innerHTML = 'Fehlerbericht senden';
+	button.onclick = function(){
+		sendErrorReport();
 		return false;
 	}
 	preloader.appendChild(button);

server/page/menus.php

@@ -211,7 +211,7 @@
 	</div>
 </div>
 
-<div id="menu-developer" class="menu menu-box-bottom menu-box-detached rounded-m" data-menu-height="360">
+<div id="menu-developer" class="menu menu-box-bottom menu-box-detached rounded-m" data-menu-height="400">
 	<div class="menu-title"><h1>Entwickler-Optionen</h1><p class="color-highlight">Version <?php echo PWA_VERSION; ?></p><a href="#" class="close-menu"><i class="fa fa-times"></i></a></div>
 	<div class="divider divider-margins mb-n2"></div>
 	<div class="content">
@@ -231,11 +231,16 @@
 				<span>Reset Cache</span>
 				<i class="fa fa-angle-right"></i>
 			</a>
-			<a href="https://github.com/ostertun/RegattenApp/issues">
+			<a href="https://github.com/ostertun/RegattenApp/issues/new">
 				<i class="fa font-14 fa-bug rounded-s bg-highlight color-white"></i>
 				<span>Problem melden</span>
 				<i class="fa fa-angle-right"></i>
 			</a>
+			<a href="#" onclick="sendErrorReport(); return false;" class="menu-close">
+				<i class="fa font-14 fa-bug rounded-s bg-highlight color-white"></i>
+				<span>Fehlerbericht senden</span>
+				<i class="fa fa-angle-right"></i>
+			</a>
 			<a href="#" onclick="mobileConsole.displayConsole(); return false;" class="border-0 menu-close">
 				<i class="fa font-14 fa-terminal rounded-s bg-highlight color-white"></i>
 				<span>Console anzeigen</span>

server/version.php

@@ -1,5 +1,5 @@
 <?php
 
-	define('PWA_VERSION', '1.11.2');
+	define('PWA_VERSION', '1.11.2h1');
 
 ?>