Reorganized the UI/xml part to better handle next steps

This commit is contained in:
emeric
2018-03-14 13:17:04 +01:00
parent 98f64e62f9
commit bc26ddae50
37 changed files with 257 additions and 228 deletions
@@ -3,13 +3,13 @@
<messages xmlns:if="Wt.WTemplate.conditions">
<!--FORMS message blocks-->
<message id="template-settings-database">
<legend>${tr:msg-settings-database}</legend>
<message id="Lms.Admin.Database.template">
<legend>${tr:Lms.Admin.Database.database}</legend>
<div class="form-horizontal">
<div class="form-group">
<label class="control-label col-sm-2" for="${id:media-directory}">
${tr:msg-settings-media-directory}
${tr:Lms.Admin.Database.path}
</label>
<div class="col-sm-5">
${media-directory}
@@ -21,7 +21,7 @@
<div class="form-group">
<label class="control-label col-sm-2" for="${id:update-period}">
${tr:msg-settings-update-period}
${tr:Lms.Admin.Database.update-period}
</label>
<div class="col-sm-5">
${update-period}
@@ -33,7 +33,7 @@
<div class="form-group">
<label class="control-label col-sm-2" for="${id:update-start-time}">
${tr:msg-settings-update-start-time}
${tr:Lms.Admin.Database.update-start-time}
</label>
<div class="col-sm-5">
${update-start-time}
@@ -3,15 +3,15 @@
<messages xmlns:if="Wt.WTemplate.conditions">
<!--FORMS message blocks-->
<message id="template-settings-admin-wizard">
<message id="Lms.AdminWizard.template">
<div class="container">
<div class="page-header">
<h2>${tr:msg-settings-admin-account}</h2>
<h2>${tr:Lms.AdminWizard.header}</h2>
</div>
<div class="form-horizontal">
<div class="form-group">
<label class="control-label col-sm-2" for="${id:admin-login}">
${tr:msg-login}
${tr:Lms.login}
</label>
<div class="col-sm-5">
${admin-login}
@@ -23,7 +23,7 @@
<div class="form-group">
<label class="control-label col-sm-2" for="${id:password}">
${tr:msg-password}
${tr:Lms.password}
</label>
<div class="col-sm-5">
${password}
@@ -35,7 +35,7 @@
<div class="form-group">
<label class="control-label col-sm-2" for="${id:password-confirm}">
${tr:msg-password-confirm}
${tr:Lms.password-confirm}
</label>
<div class="col-sm-5">
${password-confirm}
+6 -6
View File
@@ -2,15 +2,15 @@
<messages xmlns:if="Wt.WTemplate.conditions">
<!--FORMS message blocks-->
<message id="btn-artist-play-btn">
<message id="Lms.Explore.Artist.play">
<i class="fa fa-play"></i>
</message>
<message id="btn-artist-add-btn">
<message id="Lms.Explore.Artist.add">
<i class="fa fa-plus"></i>
</message>
<message id="template-artist">
<message id="Lms.Explore.Artist.template">
<div class="page-header">
<h2>${name}</h2>
${clusters}
@@ -19,11 +19,11 @@
${releases class="list-group"}
</message>
<message id="template-artist-cluster-entry">
<message id="Lms.Explore.Artist.template.cluster-entry">
<span class="badge">${name}</span>
</message>
<message id="template-artist-entry">
<message id="Lms.Explore.Artist.template.entry">
<div class="media list-group-item">
<div class="pull-left media-middle">
${cover class="media-object"}
@@ -31,7 +31,7 @@
<div class="media-body">
<h4 class="media-heading">${name}</h4>
</div>
${<if-has-various-artists>}${tr:msg-various-artists}${</if-has-various-artists>}
${<if-has-various-artists>}${tr:Lms.Explore.various-artists}${</if-has-various-artists>}
<h4>${<if-has-year>}${year}${</if-has-year>}${<if-has-orig-year>} (${orig-year})${</if-has-orig-year>}</h4>
${play-btn}${add-btn}
</div>
+3 -3
View File
@@ -2,9 +2,9 @@
<messages xmlns:if="Wt.WTemplate.conditions">
<!--FORMS message blocks-->
<message id="template-artists">
<message id="Lms.Explore.Artists.template">
<div class="page-header">
<h2>${tr:msg-artists}</h2>
<h2>${tr:Lms.Explore.artists}</h2>
</div>
<div class="form-group">
<div class="input-group">
@@ -16,7 +16,7 @@
${show-more}
</message>
<message id="template-artists-entry">
<message id="Lms.Explore.Artists.template.entry">
<div class="list-group-item">
<span class="badge">${nb-release}</span>
${name}
+45
View File
@@ -0,0 +1,45 @@
<?xml version="1.0" encoding="UTF-8" ?>
<messages xmlns:if="Wt.WTemplate.conditions">
<message id="Lms.Explore.template">
${filters}
${contents}
</message>
<message id="Lms.Explore.template.show-more">
${tr:Lms.Explore.show-more}
</message>
<message id="Lms.Explore.template.filters">
<div class="form-group">
${add-filter}${filters}
</div>
</message>
<message id="Lms.Explore.template.add-filter">
<div class="form-horizontal">
<div class="form-group">
<label class="control-label col-sm-2" for="${id:type}">
${tr:Lms.Explore.type}
</label>
<div class="col-sm-10">
${type}
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2" for="${id:value}">
${tr:Lms.Explore.value}
</label>
<div class="col-sm-10">
${value}
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
${add-btn class="btn-primary"} ${cancel-btn}
</div>
</div>
</div>
</message>
</messages>
+9
View File
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="UTF-8" ?>
<messages xmlns:if="Wt.WTemplate.conditions">
<message id="Lms.Home.template">
${tr:Lms.Home.welcome}
</message>
</messages>
+5 -5
View File
@@ -2,15 +2,15 @@
<?xml version="1.0" encoding="UTF-8" ?>
<messages xmlns:if="Wt.WTemplate.conditions">
<message id="template-login">
<message id="Lms.Auth.template">
<div class="container">
<div class="page-header">
<h2>${tr:msg-login-welcome}</h2>
<h2>${tr:Lms.Auth.welcome}</h2>
</div>
<div class="form-horizontal">
<div class="form-group">
<label class="control-label col-sm-2" for="${id:user-name}">
${tr:msg-login}
${tr:Lms.login}
</label>
<div class="col-sm-5">
${user-name}
@@ -22,7 +22,7 @@
<div class="form-group">
<label class="control-label col-sm-2" for="${id:password}">
${tr:msg-password}
${tr:Lms.password}
</label>
<div class="col-sm-5">
${password}
@@ -34,7 +34,7 @@
<div class="form-group">
<label class="control-label col-sm-2" for="${id:remember-me}">
${tr:msg-remember-me}
${tr:Lms.Auth.remember-me}
</label>
<div class="col-sm-5">
${remember-me}
+49 -41
View File
@@ -1,54 +1,62 @@
<?xml version="1.0" encoding="UTF-8" ?>
<messages xmlns:if="Wt.WTemplate.conditions">
<!--FORMS message blocks-->
<!--Common-->
<message id="Lms.add">Add</message>
<message id="Lms.apply">Apply</message>
<message id="Lms.discard">Discard</message>
<message id="Lms.administration">Administration</message>
<message id="Lms.cancel">Cancel</message>
<message id="Lms.create">Create</message>
<message id="Lms.login">Login</message>
<message id="Lms.logout">Logout</message>
<message id="Lms.not-a-directory">Not a directory</message>
<message id="Lms.password">Password</message>
<message id="Lms.password-confirm">Confirm password</message>
<message id="Lms.playqueue">Play Queue</message>
<message id="Lms.quit-confirm">Are you sure?</message>
<message id="Lms.settings">Settings</message>
<!--Administration-->
<message id="Lms.Admin.Database.daily">Daily</message>
<message id="Lms.Admin.Database.database">Database</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>
<message id="Lms.Admin.Database.path">Media root directory</message>
<message id="Lms.Admin.Database.scan-complete">Scan complete: {1} total files, {2} additions, {3} deletions, {4} duplicates, {5} errors</message>
<message id="Lms.Admin.Database.scan-launched">Scan launched!</message>
<message id="Lms.Admin.Database.settings-saved">New settings saved!</message>
<message id="Lms.Admin.Database.update-period">Update period</message>
<message id="Lms.Admin.Database.update-start-time">Update start time</message>
<message id="Lms.Admin.Database.weekly">Weekly</message>
<message id="msg-home-welcome"><h2>Welcome!</h2></message>
<!--Admin Wizard-->
<message id="Lms.AdminWizard.done">Administration account created. Please refresh to continue!</message>
<message id="Lms.AdminWizard.header">Create administrator account</message>
<message id="msg-various-artists">Various artists</message>
<message id="msg-artists">Artists</message>
<message id="msg-releases">Albums</message>
<message id="msg-tracks">Tracks</message>
<message id="msg-playqueue">Play Queue</message>
<message id="msg-filter-add">Add filter</message>
<message id="msg-search-placeholder">Search...</message>
<!--Auth-->
<message id="Lms.Auth.remember-me">Remember me</message>
<message id="Lms.Auth.welcome">Welcome!</message>
<message id="msg-add">Add</message>
<message id="msg-cancel">Cancel</message>
<!--Home-->
<message id="Lms.Home.welcome"><h2>Welcome!</h2></message>
<message id="msg-filter-type">Type</message>
<message id="msg-filter-value">Value</message>
<!--Explore-->
<message id="Lms.Explore.add-filter">Add filter</message>
<message id="Lms.Explore.artists">Artists</message>
<message id="Lms.Explore.releases">Albums</message>
<message id="Lms.Explore.search-placeholder">Search...</message>
<message id="Lms.Explore.show-more">Show more</message>
<message id="Lms.Explore.tracks">Tracks</message>
<message id="Lms.Explore.type">Type</message>
<message id="Lms.Explore.value">Value</message>
<message id="Lms.Explore.various-artists">Various artists</message>
<message id="msg-show-more">Show more</message>
<message id="msg-login">Login</message>
<message id="msg-password">Password</message>
<message id="msg-password-confirm">Verify password</message>
<message id="msg-create">Create</message>
<message id="msg-remember-me">Remember me</message>
<message id="msg-login-welcome">Welcome!</message>
<message id="msg-logout">Logout</message>
<!--Settings-->
<message id="msg-settings-admin-account">Administrator account</message>
<message id="msg-settings-first-connection-done">Account created. Please refresh to continue!</message>
<message id="msg-settings">Settings</message>
<message id="msg-settings-database">Database</message>
<message id="msg-settings-media-directory">Media root directory</message>
<message id="msg-settings-update-period">Update period</message>
<message id="msg-settings-update-start-time">Update start time</message>
<message id="msg-settings-update-start-time">Update start time</message>
<message id="msg-update-period-never">Never</message>
<message id="msg-update-period-daily">Daily</message>
<message id="msg-update-period-weekly">Weekly</message>
<message id="msg-update-period-monthly">Monthly</message>
<message id="msg-error-not-a-directory">Not a directory</message>
<message id="msg-btn-apply">Apply</message>
<message id="msg-btn-discard">Discard</message>
<message id="msg-btn-immediate-scan">Scan now!</message>
<message id="msg-notify-scan-launched">Scan launched!</message>
<message id="msg-notify-settings-saved">New settings saved!</message>
<message id="msg-notify-scan-complete">Scan complete: {1} total files, {2} additions, {3} deletions, {4} duplicates, {5} errors</message>
</messages>
+1 -1
View File
@@ -16,7 +16,7 @@
<message id="template-playqueue">
<div class="page-header">
<h2>${tr:msg-playqueue}</h2>
<h2>${tr:Lms.playqueue}</h2>
${save-btn} ${load-btn} ${clear-btn}
</div>
${entries}
+5 -5
View File
@@ -2,15 +2,15 @@
<messages xmlns:if="Wt.WTemplate.conditions">
<!--FORMS message blocks-->
<message id="btn-release-play-btn">
<message id="Lms.Explore.Release.play">
<i class="fa fa-play"></i>
</message>
<message id="btn-release-add-btn">
<message id="Lms.Explore.Release.add">
<i class="fa fa-plus"></i>
</message>
<message id="template-release">
<message id="Lms.Explore.Release.template">
${cover}
<div class="page-header">
<h2>${name}</h2>
@@ -22,11 +22,11 @@
${tracks}
</message>
<message id="template-release-cluster-entry">
<message id="Lms.Explore.Release.template.cluster-entry">
<span class="badge">${name}</span>
</message>
<message id="template-release-entry">
<message id="Lms.Explore.Release.template.entry">
${<if-has-disc-number>}${disc-number}-${</if-has-disc-number>}${<if-has-track-number>}${track-number}. ${</if-has-track-number>}
${<if-has-artist>}${artist-name} - ${</if-has-artist>}
${name}
+5 -6
View File
@@ -1,11 +1,10 @@
<?xml version="1.0" encoding="UTF-8" ?>
<messages xmlns:if="Wt.WTemplate.conditions">
<!--FORMS message blocks-->
<message id="template-releases">
<message id="Lms.Explore.Releases.template">
<div class="page-header">
<h2>${tr:msg-releases}</h2>
<h2>${tr:Lms.Explore.releases}</h2>
</div>
<div class="form-group">
<div class="input-group">
@@ -17,15 +16,15 @@
${show-more}
</message>
<message id="btn-releases-play-btn">
<message id="Lms.Explore.Releases.play">
<i class="fa fa-play"></i>
</message>
<message id="btn-releases-add-btn">
<message id="Lms.Explore.Releases.add">
<i class="fa fa-plus"></i>
</message>
<message id="template-releases-entry">
<message id="Lms.Explore.Releases.template.entry">
<div class="media list-group-item">
<div class="pull-left media-middle">
${cover class="media-object"}
+1 -47
View File
@@ -1,56 +1,10 @@
<?xml version="1.0" encoding="UTF-8" ?>
<messages xmlns:if="Wt.WTemplate.conditions">
<!--FORMS message blocks-->
<message id="template-main">
<message id="Lms.template">
${navbar-top class="main-nav"}
${contents class="container"}
${player}
</message>
<message id="template-home">
${tr:msg-home-welcome}
</message>
<message id="template-explore">
${filters}
${contents}
</message>
<message id="template-show-more">
${tr:msg-show-more}
</message>
<message id="template-filters">
<div class="form-group">
${add-filter}${filters}
</div>
</message>
<message id="template-filter-add">
<div class="form-horizontal">
<div class="form-group">
<label class="control-label col-sm-2" for="${id:type}">
${tr:msg-filter-type}
</label>
<div class="col-sm-10">
${type}
</div>
</div>
<div class="form-group">
<label class="control-label col-sm-2" for="${id:value}">
${tr:msg-filter-value}
</label>
<div class="col-sm-10">
${value}
</div>
</div>
<div class="form-group">
<div class="col-sm-offset-2 col-sm-10">
${add class="btn-primary"} ${cancel}
</div>
</div>
</div>
</message>
</messages>
+5 -5
View File
@@ -3,9 +3,9 @@
<messages xmlns:if="Wt.WTemplate.conditions">
<!--FORMS message blocks-->
<message id="template-tracks">
<message id="Lms.Explore.Tracks.template">
<div class="page-header">
<h2>${tr:msg-tracks}</h2>
<h2>${tr:Lms.Explore.tracks}</h2>
${play-btn}${add-btn}
</div>
<div class="form-group">
@@ -18,15 +18,15 @@
${show-more}
</message>
<message id="btn-tracks-play-btn">
<message id="Lms.Explore.Tracks.play">
<i class="fa fa-play"></i>
</message>
<message id="btn-tracks-add-btn">
<message id="Lms.Explore.Tracks.add">
<i class="fa fa-plus"></i>
</message>
<message id="template-tracks-entry">
<message id="Lms.Explore.Tracks.template.entry">
<div class="media list-group-item">
<div class="pull-left media-middle">
${cover class="media-object"}