Regatten.net/RegattenApp
1
0
Fork 0
Code Issues 40 Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'hotfix/error_report_button' into develop

Browse Source
This commit is contained in:
ostertun
2020-10-22 14:54:23 +02:00
parent a2fe4c2637 4e85d3a993
commit 7fd1c1c6e7
3 changed files with 33 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
client/scripts/regatten.js.php
View File

@@ -566,20 +566,7 @@ var onAfterSync = function() {
updateNewsBadge();
}
// 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(){
function sendErrorReport() {
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);

9
server/page/menus.php
View File

@@ -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>

2
server/version.php
View File

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