owen/lms
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Various UI small improvements (better error reporting in case of bad url, made the password change fields more explicit)

Browse Source
This commit is contained in:
emeric
2019-10-06 18:59:13 +02:00
parent b5cfe014ec
commit 174158aa63
17 changed files with 182 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files
approot/admin-database.xml
+8 -4
View File
@@ -86,16 +86,20 @@
<label class="control-label col-sm-2" for="${id:last-scan}">
${tr:Lms.Admin.Database.Status.last-scan}
</label>
<div class="col-sm-5 well well-sm">
${last-scan}
<div class="col-sm-5">
<div class="well well-sm">
${last-scan}
</div>
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2" for="${id:status}">
${tr:Lms.Admin.Database.Status.status}
</label>
<div class="col-sm-5 well well-sm">
${status}
<div class="col-sm-5">
<div class="well well-sm">
${status}
</div>
</div>
</div>
</div>
approot/admin-user.xml
+4 -2
View File
@@ -12,7 +12,9 @@
${tr:Lms.Admin.User.last-login}
</label>
<div class="col-sm-5">
${last-login}
<div class="well well-sm">
${last-login}
</div>
</div>
</div>
${</if-has-last-login>}
@@ -31,7 +33,7 @@
${</if-has-login>}
<div class="form-group">
<label class="control-label col-sm-2" for="${id:password}">
${tr:Lms.password}
${tr:Lms.password-new}
</label>
<div class="col-sm-5">
${password}
approot/error.xml
+14
View File
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="UTF-8" ?>
<messages xmlns:if="Wt.WTemplate.conditions">
<message id="Lms.Error.template">
<div class="container">
<div class="page-header">
<h2>${tr:Lms.Error.error-occurred}</h2>
</div>
<p><strong>${error}</strong></p>
${btn-go-home class="btn btn-primary"}
</div>
</message>
</messages>
approot/messages.xml
+11 -2
View File
@@ -16,6 +16,7 @@
<message id="Lms.password-bad-login-combination">Bad login / password combination</message>
<message id="Lms.password-client-throttled">Login throttled, please try again later</message>
<message id="Lms.password-confirm">Confirm password</message>
<message id="Lms.password-new">New password</message>
<message id="Lms.password-old">Old password</message>
<message id="Lms.password-too-weak">Password too weak</message>
<message id="Lms.passwords-dont-match">Passwords don't match</message>
@@ -23,9 +24,17 @@
<message id="Lms.quit-other-session">Another session has been open. Reopen this one?</message>
<message id="Lms.save">Save</message>
<!--Errors-->
<message id="Lms.Error.artist-not-found">Artist not found</message>
<message id="Lms.Error.error-occurred">Error occured!</message>
<message id="Lms.Error.go-home">Go home</message>
<message id="Lms.Error.release-not-found">Release not found</message>
<message id="Lms.Error.user-not-allowed">You are not allowed to perform this operation</message>
<message id="Lms.Error.user-not-found">User not found</message>
<!--Administration-->
<message id="Lms.Admin.Database.daily">Daily</message>
<message id="Lms.Admin.Database.database">Database</message>
<message id="Lms.Admin.Database.database">Music collection</message>
<message id="Lms.Admin.Database.immediate-scan">Scan now!</message>
<message id="Lms.Admin.Database.monthly">Monthly</message>
<message id="Lms.Admin.Database.never">Never</message>
@@ -134,8 +143,8 @@
<!--Settings-->
<message id="Lms.Settings.account">Account</message>
<message id="Lms.Settings.audio">Audio</message>
<message id="Lms.Settings.change-password">Change password</message>
<message id="Lms.Settings.demo-cannot-save">Cannot save using a demo account!</message>
<message id="Lms.Settings.password-bad">Bad password</message>
<message id="Lms.Settings.password-must-fill-old-password">Old password must be filled in</message>
approot/messages_fr.xml
+11 -3
View File
@@ -16,6 +16,7 @@
<message id="Lms.password-bad-login-combination">Mauvaise combinaison login / mot de passe</message>
<message id="Lms.password-client-throttled">Trop de tentatives de connexion, veuillez réessayer plus tard</message>
<message id="Lms.password-confirm">Confirmation du mot de passe</message>
<message id="Lms.password-new">Nouveau mot de passe</message>
<message id="Lms.password-old">Ancien mot de passe</message>
<message id="Lms.password-too-weak">Mot de passe trop faible</message>
<message id="Lms.passwords-dont-match">Les mots de passe ne correspondent pas</message>
@@ -23,9 +24,17 @@
<message id="Lms.quit-other-session">Une autre session a été ouverte. Reouvrir celle-ci ?</message>
<message id="Lms.save">Sauvegarder</message>
<!--Errors-->
<message id="Lms.Error.artist-not-found">Cet artiste n'existe pas</message>
<message id="Lms.Error.error-occurred">Une erreur est survenue!</message>
<message id="Lms.Error.go-home">Retour à l'accueil</message>
<message id="Lms.Error.release-not-found">Cet album n'existe pas</message>
<message id="Lms.Error.user-not-allowed">Vous n'avez pas les droits pour effectuer cette opération</message>
<message id="Lms.Error.user-not-found">L'utilisateur n'existe pas</message>
<!--Administration-->
<message id="Lms.Admin.Database.daily">Tous les jours</message>
<message id="Lms.Admin.Database.database">Base de données</message>
<message id="Lms.Admin.Database.database">Collection de musiques</message>
<message id="Lms.Admin.Database.immediate-scan">Scanner maintenant !</message>
<message id="Lms.Admin.Database.monthly">Tous les mois</message>
<message id="Lms.Admin.Database.never">Jamais</message>
@@ -134,9 +143,8 @@
<!--Settings-->
<message id="Lms.Settings.account">Compte</message>
<message id="Lms.Settings.audio">Audio</message>
<message id="Lms.Settings.auto">Auto</message>
<message id="Lms.Settings.change-password">Changement de mot de passe</message>
<message id="Lms.Settings.demo-cannot-save">Impossible de sauvegarder en utilisant un compte de démo !</message>
<message id="Lms.Settings.password-bad">Mauvais mot de passe</message>
<message id="Lms.Settings.password-must-fill-old-password">L'ancien mot de passe doit être renseigné</message>
approot/settings.xml
+2 -2
View File
@@ -43,7 +43,7 @@
</div>
</div>
</div>
<legend>${tr:Lms.Settings.account}</legend>
<legend>${tr:Lms.Settings.change-password}</legend>
<div class="form-horizontal">
${<if-has-old-password>}
<div class="form-group">
@@ -60,7 +60,7 @@
${</if-has-old-password>}
<div class="form-group">
<label class="control-label col-sm-2" for="${id:password}">
${tr:Lms.password}
${tr:Lms.password-new}
</label>
<div class="col-sm-5">
${password}