Merge branch 'hotfix/fix_expenditures_approve' into develop

client/scripts/strings.js.php

@@ -54,5 +54,5 @@ const strings = {
 		'Donnerstag',
 		'Freitag',
 		'Samstag'
-	],
+	]
 }

server/page/menus.php

@@ -260,7 +260,7 @@
 		<div class="input-style input-style-2 has-icon input-required">
 			<i class="input-icon fa fa-user color-theme"></i>
 			<span class="color-highlight">Benutzername</span>
-			<input id="input-login-username" class="form-control" type="name" placeholder="Benutzername" />
+			<input id="input-login-username" class="form-control" type="text" placeholder="Benutzername" />
 		</div>
 		<div class="input-style input-style-2 has-icon input-required">
 			<i class="input-icon fa fa-lock color-theme"></i>

server/scripts/expenditures-user.js

@@ -31,10 +31,10 @@ async function onListClicked(id) {
 	if (exp.approved == 0 && (exp.direction < 0) == (exp.canceled == 0)) {
 		$('#menu-item-approve').show();
 		$('#menu-item-approve').attr('onclick', 'expenditureAction("approve", ' + exp['id'] + ', "' + (exp.canceled == 1 ? 'Stornierung' : 'Ausgabe') + ' genehmigt")');
-		$('#menu-item-approve').text(exp.canceled == 1 ? 'Storno akzeptieren' : 'Akzeptieren');
+		$('#menu-item-approve').find('span').text(exp.canceled == 1 ? 'Storno akzeptieren' : 'Akzeptieren');
 		$('#menu-item-decline').show();
 		$('#menu-item-decline').attr('onclick', 'expenditureAction("decline", ' + exp['id'] + ', "Ausgabe ' + (exp.canceled == 1 ? 'erneut angefragt' : 'abgelehnt') + '")');
-		$('#menu-item-decline').text(exp.canceled == 1 ? 'Erneut anfragen' : 'Ablehnen');
+		$('#menu-item-decline').find('span').text(exp.canceled == 1 ? 'Erneut anfragen' : 'Ablehnen');
 	} else {
 		$('#menu-item-approve').hide();
 		$('#menu-item-decline').hide();

server/version.php

@@ -1,5 +1,5 @@
 <?php
 
-	define('PWA_VERSION', '1.13h5');
+	define('PWA_VERSION', '1.13h6');
 
 ?>