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

#582 - use new content macro on every page

parent fc68b894
Branches
Tags
No related merge requests found
Show whitespace changes
Inline Side-by-side
Showing
with 725 additions and 669 deletions
src/main/resources/templates/about.ftl
+ 31
− 28
View file @ fde8183d
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
<@header.logo "logo-huge" "responsive-img"/> <@header.logo "logo-huge" "responsive-img"/>
</div> </div>
</div> </div>
<@header.content>
<div class="hide-on-small-only"><br><br></div> <div class="hide-on-small-only"><br><br></div>
<div class="row"> <div class="row">
<@cellKey locale.getString("about.version")/> <@cellKey locale.getString("about.version")/>
...@@ -46,6 +48,7 @@ ...@@ -46,6 +48,7 @@
<@cellKey locale.getString("about.credits")/> <@cellKey locale.getString("about.credits")/>
<div class="col s8 m5 l5">${locale.getString("credits")}</div> <div class="col s8 m5 l5">${locale.getString("credits")}</div>
</div> </div>
</@header.content>
</div> </div>
</main> </main>
......
src/main/resources/templates/accounts/accounts.ftl
+ 7
− 4
View file @ fde8183d
...@@ -16,6 +16,8 @@ ...@@ -16,6 +16,8 @@
<div class="headline"><i class="material-icons">account_balance</i> ${locale.getString("menu.accounts")}</div> <div class="headline"><i class="material-icons">account_balance</i> ${locale.getString("menu.accounts")}</div>
</div> </div>
</div> </div>
<@header.content>
<br> <br>
<div class="center-align"><@header.buttonLink url='/accounts/newAccount' icon='add' localizationKey='title.account.new' id='button-new-account'/></div> <div class="center-align"><@header.buttonLink url='/accounts/newAccount' icon='add' localizationKey='title.account.new' id='button-new-account'/></div>
<br> <br>
...@@ -52,6 +54,7 @@ ...@@ -52,6 +54,7 @@
<div class="headline center-align">${locale.getString("placeholder")}</div> <div class="headline center-align">${locale.getString("placeholder")}</div>
</#if> </#if>
</div> </div>
</@header.content>
</div> </div>
</main> </main>
......
src/main/resources/templates/accounts/newAccount.ftl
+ 4
− 1
View file @ fde8183d
...@@ -23,6 +23,8 @@ ...@@ -23,6 +23,8 @@
<div class="headline">${title}</div> <div class="headline">${title}</div>
</div> </div>
</div> </div>
<@header.content>
<div class="container"> <div class="container">
<#import "../helpers/validation.ftl" as validation> <#import "../helpers/validation.ftl" as validation>
<form name="NewAccount" action="<@s.url '/accounts/newAccount'/>" method="post"> <form name="NewAccount" action="<@s.url '/accounts/newAccount'/>" method="post">
...@@ -66,6 +68,7 @@ ...@@ -66,6 +68,7 @@
</div> </div>
</form> </form>
</div> </div>
</@header.content>
</div> </div>
</main> </main>
......
src/main/resources/templates/categories/categories.ftl
+ 6
− 4
View file @ fde8183d
...@@ -22,6 +22,7 @@ ...@@ -22,6 +22,7 @@
</div> </div>
</div> </div>
<@header.content>
<br> <br>
<div class="center-align"><@header.buttonLink url='/categories/newCategory' icon='add' localizationKey='title.category.new'/></div> <div class="center-align"><@header.buttonLink url='/categories/newCategory' icon='add' localizationKey='title.category.new'/></div>
<br> <br>
...@@ -56,6 +57,7 @@ ...@@ -56,6 +57,7 @@
<div class="headline center-align">${locale.getString("placeholder")}</div> <div class="headline center-align">${locale.getString("placeholder")}</div>
</#if> </#if>
</div> </div>
</@header.content>
</div> </div>
<#if currentCategory??> <#if currentCategory??>
......
src/main/resources/templates/categories/newCategory.ftl
+ 59
− 55
View file @ fde8183d
...@@ -28,6 +28,9 @@ ...@@ -28,6 +28,9 @@
<div class="headline">${title}</div> <div class="headline">${title}</div>
</div> </div>
</div> </div>
<@header.content>
<div class="container"> <div class="container">
<#import "../helpers/validation.ftl" as validation> <#import "../helpers/validation.ftl" as validation>
<form name="NewCategory" action="<@s.url '/categories/newCategory'/>" method="post"> <form name="NewCategory" action="<@s.url '/categories/newCategory'/>" method="post">
...@@ -98,6 +101,7 @@ ...@@ -98,6 +101,7 @@
</div> </div>
</form> </form>
</div> </div>
</@header.content>
</div> </div>
</main> </main>
......
src/main/resources/templates/charts/charts.ftl
+ 32
− 30
View file @ fde8183d
...@@ -25,6 +25,7 @@ ...@@ -25,6 +25,7 @@
</div> </div>
</div> </div>
<@header.content>
<br> <br>
<div class="center-align"><@header.buttonLink url='/charts/manage' icon='edit' localizationKey='home.menu.charts.action.manage'/></div> <div class="center-align"><@header.buttonLink url='/charts/manage' icon='edit' localizationKey='home.menu.charts.action.manage'/></div>
<br> <br>
...@@ -64,6 +65,7 @@ ...@@ -64,6 +65,7 @@
<div id="${containerID}" class="chart-canvas"></div> <div id="${containerID}" class="chart-canvas"></div>
</#if> </#if>
</div> </div>
</@header.content>
</div> </div>
</main> </main>
......
src/main/resources/templates/charts/manage.ftl
+ 39
− 36
View file @ fde8183d
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
<div class="headline">${locale.getString("menu.charts")}</div> <div class="headline">${locale.getString("menu.charts")}</div>
</div> </div>
</div> </div>
<@header.content>
<br> <br>
<@chartFunctions.buttons/> <@chartFunctions.buttons/>
<br> <br>
...@@ -54,6 +56,7 @@ ...@@ -54,6 +56,7 @@
<div class="headline center-align">${locale.getString("placeholder")}</div> <div class="headline center-align">${locale.getString("placeholder")}</div>
</#if> </#if>
</div> </div>
</@header.content>
</div> </div>
<#if currentChart??> <#if currentChart??>
......
src/main/resources/templates/charts/newChart.ftl
+ 4
− 1
View file @ fde8183d
...@@ -27,6 +27,8 @@ ...@@ -27,6 +27,8 @@
<div class="headline">${title}</div> <div class="headline">${title}</div>
</div> </div>
</div> </div>
<@header.content>
<div class="container"> <div class="container">
<#import "../helpers/validation.ftl" as validation> <#import "../helpers/validation.ftl" as validation>
<form name="NewChart" action="<@s.url '/charts/newChart'/>" method="post"> <form name="NewChart" action="<@s.url '/charts/newChart'/>" method="post">
...@@ -93,6 +95,7 @@ ...@@ -93,6 +95,7 @@
</div> </div>
</form> </form>
</div> </div>
</@header.content>
</div> </div>
</main> </main>
......
src/main/resources/templates/firstUse.ftl
+ 73
− 70
View file @ fde8183d
...@@ -18,6 +18,8 @@ ...@@ -18,6 +18,8 @@
<div class="headline"><i class="fas fa-graduation-cap"></i> ${locale.getString("home.first.use")}</div> <div class="headline"><i class="fas fa-graduation-cap"></i> ${locale.getString("home.first.use")}</div>
</div> </div>
</div> </div>
<@header.content>
<br> <br>
<div class="container"> <div class="container">
...@@ -104,6 +106,7 @@ ...@@ -104,6 +106,7 @@
</div> </div>
</div> </div>
</div> </div>
</@header.content>
</div> </div>
</main> </main>
......
src/main/resources/templates/hotkeys.ftl
+ 18
− 16
View file @ fde8183d
...@@ -17,6 +17,7 @@ ...@@ -17,6 +17,7 @@
</div> </div>
</div> </div>
<@header.content>
<br> <br>
<div class="row"> <div class="row">
...@@ -40,6 +41,7 @@ ...@@ -40,6 +41,7 @@
<div class="col s8 m5 l5">${hotKey.getTextLocalized()}</div> <div class="col s8 m5 l5">${hotKey.getTextLocalized()}</div>
</div> </div>
</#list> </#list>
</@header.content>
</div> </div>
</main> </main>
......
src/main/resources/templates/index.ftl
+ 31
− 29
View file @ fde8183d
...@@ -23,6 +23,7 @@ ...@@ -23,6 +23,7 @@
</div> </div>
</div> </div>
<@header.content>
<#if settings.getShowFirstUseBanner()> <#if settings.getShowFirstUseBanner()>
<@indexFunctions.firstUseBanner/> <@indexFunctions.firstUseBanner/>
</#if> </#if>
...@@ -59,6 +60,7 @@ ...@@ -59,6 +60,7 @@
<@indexFunctions.action url="/categories/newCategory" name="home.menu.categories.action.new"/> <@indexFunctions.action url="/categories/newCategory" name="home.menu.categories.action.new"/>
</@indexFunctions.homeEntry> </@indexFunctions.homeEntry>
</div> </div>
</@header.content>
</div> </div>
</div> </div>
</main> </main>
......
src/main/resources/templates/reports/reports.ftl
+ 4
− 2
View file @ fde8183d
...@@ -20,6 +20,7 @@ ...@@ -20,6 +20,7 @@
<#import "../helpers/globalDatePicker.ftl" as datePicker> <#import "../helpers/globalDatePicker.ftl" as datePicker>
<@datePicker.datePicker currentDate "/reports"/> <@datePicker.datePicker currentDate "/reports"/>
<@header.content>
<br> <br>
<div class="container"> <div class="container">
...@@ -102,6 +103,7 @@ ...@@ -102,6 +103,7 @@
</div> </div>
</form> </form>
</div> </div>
</@header.content>
</div> </div>
<@filterMacros.filterModal filterConfiguration/> <@filterMacros.filterModal filterConfiguration/>
......
src/main/resources/templates/search/search.ftl
+ 47
− 44
View file @ fde8183d
...@@ -22,6 +22,8 @@ ...@@ -22,6 +22,8 @@
<div class="headline">${locale.getString("menu.search.results", page.getTotalElements())}</div> <div class="headline">${locale.getString("menu.search.results", page.getTotalElements())}</div>
</div> </div>
</div> </div>
<@header.content>
<form id="searchForm" action="<@s.url '/search'/>" method="get"> <form id="searchForm" action="<@s.url '/search'/>" method="get">
<@searchMacros.searchTextAndButton search/> <@searchMacros.searchTextAndButton search/>
<@searchMacros.checkboxes search/> <@searchMacros.checkboxes search/>
...@@ -76,6 +78,7 @@ ...@@ -76,6 +78,7 @@
</#if> </#if>
</div> </div>
</div> </div>
</@header.content>
</div> </div>
</main> </main>
......
src/main/resources/templates/settings/settings.ftl
+ 148
− 145
View file @ fde8183d
...@@ -19,6 +19,8 @@ ...@@ -19,6 +19,8 @@
<div class="headline"><i class="material-icons">settings</i> ${locale.getString("menu.settings")}</div> <div class="headline"><i class="material-icons">settings</i> ${locale.getString("menu.settings")}</div>
</div> </div>
</div> </div>
<@header.content>
<div class="container"> <div class="container">
<#import "../helpers/validation.ftl" as validation> <#import "../helpers/validation.ftl" as validation>
<form name="Settings" action="<@s.url '/settings/save'/>" method="post" onsubmit="return validateForm()"> <form name="Settings" action="<@s.url '/settings/save'/>" method="post" onsubmit="return validateForm()">
...@@ -201,6 +203,7 @@ ...@@ -201,6 +203,7 @@
</div> </div>
<@settingsMacros.databaseNormal/> <@settingsMacros.databaseNormal/>
<@settingsMacros.databaseSmall/> <@settingsMacros.databaseSmall/>
</@header.content>
</div> </div>
</main> </main>
......
src/main/resources/templates/templates/newTemplate.ftl
+ 4
− 1
View file @ fde8183d
...@@ -29,6 +29,8 @@ ...@@ -29,6 +29,8 @@
<div class="headline">${title}</div> <div class="headline">${title}</div>
</div> </div>
</div> </div>
<@header.content>
<div class="container"> <div class="container">
<#import "../helpers/validation.ftl" as validation> <#import "../helpers/validation.ftl" as validation>
<form name="NewTemplate" action="<@s.url '/templates/newTemplate'/>" method="post" onsubmit="return validateForm(true)"> <form name="NewTemplate" action="<@s.url '/templates/newTemplate'/>" method="post" onsubmit="return validateForm(true)">
...@@ -79,6 +81,7 @@ ...@@ -79,6 +81,7 @@
<@newTransactionMacros.buttons "/templates"/> <@newTransactionMacros.buttons "/templates"/>
</form> </form>
</div> </div>
</@header.content>
</div> </div>
</main> </main>
......
src/main/resources/templates/templates/templates.ftl
+ 19
− 16
View file @ fde8183d
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
<div class="section center-align"> <div class="section center-align">
<div class="headline"><i class="material-icons">file_copy</i> ${locale.getString("menu.templates")}</div> <div class="headline"><i class="material-icons">file_copy</i> ${locale.getString("menu.templates")}</div>
</div> </div>
<@header.content>
<div class="row"> <div class="row">
<div class="input-field col s12 m12 l8 offset-l2"> <div class="input-field col s12 m12 l8 offset-l2">
<i class="material-icons prefix">search</i> <i class="material-icons prefix">search</i>
...@@ -39,6 +41,7 @@ ...@@ -39,6 +41,7 @@
<@templateFunctions.listTemplates templates/> <@templateFunctions.listTemplates templates/>
</#if> </#if>
</div> </div>
</@header.content>
<#if currentTemplate??> <#if currentTemplate??>
<@header.modalConfirmDelete title=locale.getString("info.title.template.delete") confirmUrl='/templates' cancelUrlBase='/templates' itemId=currentTemplate.getID() confirmButtonTextKey='info.title.template.delete'> <@header.modalConfirmDelete title=locale.getString("info.title.template.delete") confirmUrl='/templates' cancelUrlBase='/templates' itemId=currentTemplate.getID() confirmButtonTextKey='info.title.template.delete'>
......
src/main/resources/templates/transactions/newTransactionNormal.ftl
+ 39
− 36
View file @ fde8183d
...@@ -29,6 +29,8 @@ ...@@ -29,6 +29,8 @@
<div class="headline">${title}</div> <div class="headline">${title}</div>
</div> </div>
</div> </div>
<@header.content>
<div class="container"> <div class="container">
<#import "../helpers/validation.ftl" as validation> <#import "../helpers/validation.ftl" as validation>
<form name="NewTransaction" action="<@s.url '/transactions/newTransaction/normal'/>" method="post" onsubmit="return validateForm()"> <form name="NewTransaction" action="<@s.url '/transactions/newTransaction/normal'/>" method="post" onsubmit="return validateForm()">
...@@ -76,6 +78,7 @@ ...@@ -76,6 +78,7 @@
<div id="changeTransactionTypeModalContainer"></div> <div id="changeTransactionTypeModalContainer"></div>
</div> </div>
</@header.content>
</div> </div>
</main> </main>
......
src/main/resources/templates/transactions/newTransactionRepeating.ftl
+ 49
− 46
View file @ fde8183d
...@@ -28,6 +28,8 @@ ...@@ -28,6 +28,8 @@
<div class="headline">${title}</div> <div class="headline">${title}</div>
</div> </div>
</div> </div>
<@header.content>
<div class="container"> <div class="container">
<#import "../helpers/validation.ftl" as validation> <#import "../helpers/validation.ftl" as validation>
<form name="NewTransaction" action="<@s.url '/transactions/newTransaction/repeating'/>" method="post" onsubmit="return validateForm()"> <form name="NewTransaction" action="<@s.url '/transactions/newTransaction/repeating'/>" method="post" onsubmit="return validateForm()">
...@@ -74,6 +76,7 @@ ...@@ -74,6 +76,7 @@
<div id="changeTransactionTypeModalContainer"></div> <div id="changeTransactionTypeModalContainer"></div>
</div> </div>
</@header.content>
</div> </div>
</main> </main>
......
src/main/resources/templates/transactions/newTransactionTransfer.ftl
+ 55
− 52
View file @ fde8183d
...@@ -29,6 +29,8 @@ ...@@ -29,6 +29,8 @@
<div class="headline">${title}</div> <div class="headline">${title}</div>
</div> </div>
</div> </div>
<@header.content>
<div class="container"> <div class="container">
<#import "../helpers/validation.ftl" as validation> <#import "../helpers/validation.ftl" as validation>
<form name="NewTransaction" action="<@s.url '/transactions/newTransaction/transfer'/>" method="post" onsubmit="return validateForm()"> <form name="NewTransaction" action="<@s.url '/transactions/newTransaction/transfer'/>" method="post" onsubmit="return validateForm()">
...@@ -81,6 +83,7 @@ ...@@ -81,6 +83,7 @@
<div id="changeTransactionTypeModalContainer"></div> <div id="changeTransactionTypeModalContainer"></div>
</div> </div>
</@header.content>
</div> </div>
</main> </main>
......
src/main/resources/templates/transactions/transactions.ftl
+ 56
− 53
View file @ fde8183d
...@@ -20,6 +20,8 @@ ...@@ -20,6 +20,8 @@
<div class="card main-card background-color"> <div class="card main-card background-color">
<#import "../helpers/globalDatePicker.ftl" as datePicker> <#import "../helpers/globalDatePicker.ftl" as datePicker>
<@datePicker.datePicker currentDate "/transactions"/> <@datePicker.datePicker currentDate "/transactions"/>
<@header.content>
<div class="container transaction-container"> <div class="container transaction-container">
<div class="row"> <div class="row">
<div class="col s4"> <div class="col s4">
...@@ -85,6 +87,7 @@ ...@@ -85,6 +87,7 @@
<#-- show placeholde text if no transactions are present in the current month or REST ist the only transaction --> <#-- show placeholde text if no transactions are present in the current month or REST ist the only transaction -->
<@transactionsMacros.placeholder transactions/> <@transactionsMacros.placeholder transactions/>
</div> </div>
</@header.content>
</div> </div>
<#if currentTransaction??> <#if currentTransaction??>
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment