Skip to content
Snippets Groups Projects
Commit 9cf1efb5 authored by Robert Goldmann's avatar Robert Goldmann
Browse files

Fixed #465: re-organize settings

parent ff2f543f
No related branches found
No related tags found
No related merge requests found
Pipeline #2074 passed
Stage: build
Stage: test
Show whitespace changes
Inline Side-by-side
src/main/resources/languages/_de.properties
+ 2
− 1
View file @ 9cf1efb5
......@@ -164,7 +164,8 @@ settings.backupReminder=Backup-Erinnerung
settings.backupReminder.deactivated=Aus
settings.backupReminder.activated=An
settings.language=Sprache
settings.updates=Automatische Updatesuche
settings.updates=Updates
settings.updates.automatic=Automatische Updatesuche
settings.updates.automatic.deactivated=Aus
settings.updates.automatic.activated=An
settings.updates.search=Suchen
......
src/main/resources/languages/_en.properties
+ 2
− 1
View file @ 9cf1efb5
......@@ -164,7 +164,8 @@ settings.backupReminder=Backup reminder
settings.backupReminder.deactivated=Off
settings.backupReminder.activated=On
settings.language=Language
settings.updates=Automatic Update Search
settings.updates=Updates
settings.updates.automatic=Automatic Update Search
settings.updates.automatic.deactivated=Off
settings.updates.automatic.activated=On
settings.updates.search=Search
......
src/main/resources/static/css/dark/settings.css 0 → 100644
+ 22
− 0
View file @ 9cf1efb5
.table-container {
display: table;
margin: auto;
}
.table-cell {
display: table-cell
}
.table-cell-valign {
vertical-align: middle;
}
.table-cell-spacer {
width: 3em;
}
.switch-cell-margin {
height: 1.5em;
margin-top: 2em;
margin-bottom: 2em;
}
\ No newline at end of file
src/main/resources/templates/settings/settings.ftl
+ 32
− 37
View file @ 9cf1efb5
......@@ -2,6 +2,7 @@
<head>
<#import "../helpers/header.ftl" as header>
<@header.header "BudgetMaster"/>
<@header.style "settings"/>
<#import "/spring.ftl" as s>
</head>
<body class="budgetmaster-blue-light">
......@@ -67,43 +68,6 @@
</div>
</div>
<#-- updates -->
<div class="row">
<div class="col s12 m12 l8 offset-l2">
${locale.getString("settings.updates")}
</div>
</div>
<div class="row">
<div class="col s12 m12 l8 offset-l2">
<table class="no-border-table">
<tr>
<td rowspan="2">
<div class="switch">
<label>
${locale.getString("settings.updates.automatic.deactivated")}
<input type="checkbox" name="autoUpdateCheckEnabled" <#if settings.isAutoUpdateCheckEnabled()>checked</#if>>
<span class="lever"></span>
${locale.getString("settings.updates.automatic.activated")}
</label>
</div>
</td>
<td>${locale.getString("settings.updates.current.version")}</td>
<td>v${build.getVersionName()}</td>
</tr>
<tr>
<td>${locale.getString("settings.updates.latest.version")}</td>
<td>${helpers.getAvailableVersionString()}</td>
</tr>
<tr>
<td colspan="4" class="center-align">
<a href="<@s.url '/updateSearch'/>" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">refresh</i>${locale.getString("settings.updates.search")}</a>
</td>
</tr>
</table>
</div>
</div>
<#-- search items per page -->
<div class="row">
<div class="input-field col s12 m12 l8 offset-l2">
......@@ -133,6 +97,37 @@
</form>
</div>
<hr>
<#-- updates -->
<div class="container">
<div class="section center-align">
<div class="headline">${locale.getString("settings.updates")}</div>
</div>
</div>
<div class="row">
<div class="col s12 m12 l8 offset-l2 center-align">
<div class="table-container">
<div class="table-cell">
<div class="right-align" style="margin-bottom: 1em;">${locale.getString("settings.updates.current.version")}</div>
<div class="right-align">${locale.getString("settings.updates.latest.version")}</div>
</div>
<div class="table-cell table-cell-spacer"></div>
<div class="table-cell">
<div class="left-align" style="margin-bottom: 1em; margin-right: 5em">v${build.getVersionName()}</div>
<div class="left-align">${helpers.getAvailableVersionString()}</div>
</div>
<div class="table-cell table-cell-valign">
<a href="<@s.url '/updateSearch'/>" class="waves-effect waves-light btn budgetmaster-blue"><i class="material-icons left">refresh</i>${locale.getString("settings.updates.search")}</a>
</div>
</div>
</div>
</div>
<hr>
<#-- database -->
<div class="container">
......
src/main/resources/templates/settings/settingsMacros.ftl
+ 17
− 10
View file @ 9cf1efb5
......@@ -2,21 +2,28 @@
<#macro switches settings>
<div class="row">
<div class="col s12 l2 offset-l3 center-align settings-switch">
<div class="col s12">
<div class="table-container">
<div class="table-cell">
<div class="switch-cell-margin">${locale.getString("settings.rest")}</div>
<div class="switch-cell-margin">${locale.getString("settings.darkTheme")}</div>
<div class="switch-cell-margin">${locale.getString("settings.backupReminder")}</div>
<div class="switch-cell-margin">${locale.getString("settings.updates.automatic")}</div>
</div>
<div class="table-cell table-cell-spacer"></div>
<div class="table-cell">
<@switch "rest" "restActivated" settings.isRestActivated()/>
</div>
<div class="col s12 l2 center-align settings-switch">
<@switch "darkTheme" "useDarkTheme" settings.isUseDarkTheme()/>
</div>
<div class="col s12 l2 center-align settings-switch">
<@switch "backupReminder" "backupReminderActivated" settings.getBackupReminderActivated()/>
<@switch "updates.automatic" "autoUpdateCheckEnabled" settings.isAutoUpdateCheckEnabled()/>
</div>
</div>
</div>
</div>
</#macro>
<#macro switch localizationKey name isActive>
${locale.getString("settings.${localizationKey}")}
<div class="switch">
<div class="switch switch-cell-margin">
<label>
${locale.getString("settings.${localizationKey}.deactivated")}
<input type="checkbox" name="${name}" <#if isActive>checked</#if>/>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment