From e10ffa650d9c5d1da13c48e9a2b1caf2a9fc2d85 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Thu, 10 Dec 2020 21:42:09 +0100
Subject: [PATCH] Fixed #569 - set meaningful page titles
---
src/main/resources/templates/about.ftl | 2 +-
src/main/resources/templates/accounts/accounts.ftl | 2 +-
src/main/resources/templates/accounts/newAccount.ftl | 11 +++++++++--
.../resources/templates/categories/categories.ftl | 2 +-
.../resources/templates/categories/newCategory.ftl | 11 +++++++++--
src/main/resources/templates/charts/charts.ftl | 2 +-
src/main/resources/templates/charts/manage.ftl | 2 +-
src/main/resources/templates/charts/newChart.ftl | 11 +++++++++--
src/main/resources/templates/firstUse.ftl | 2 +-
src/main/resources/templates/hotkeys.ftl | 2 +-
src/main/resources/templates/login.ftl | 2 +-
src/main/resources/templates/reports/reports.ftl | 2 +-
src/main/resources/templates/search/search.ftl | 2 +-
src/main/resources/templates/settings/import.ftl | 2 +-
src/main/resources/templates/settings/settings.ftl | 2 +-
.../resources/templates/templates/newTemplate.ftl | 10 ++++++++--
src/main/resources/templates/templates/templates.ftl | 2 +-
.../templates/transactions/newTransactionNormal.ftl | 12 +++++++++---
.../transactions/newTransactionRepeating.ftl | 12 +++++++++---
.../transactions/newTransactionTransfer.ftl | 12 +++++++++---
.../templates/transactions/transactions.ftl | 2 +-
21 files changed, 76 insertions(+), 31 deletions(-)
diff --git a/src/main/resources/templates/about.ftl b/src/main/resources/templates/about.ftl
index 01076cdc8..1d05e0333 100644
--- a/src/main/resources/templates/about.ftl
+++ b/src/main/resources/templates/about.ftl
@@ -2,7 +2,7 @@
<head>
<#import "helpers/header.ftl" as header>
<@header.globals/>
- <@header.header "BudgetMaster"/>
+ <@header.header "BudgetMaster - ${locale.getString('menu.about')}"/>
</head>
<body class="budgetmaster-blue-light">
<#import "helpers/navbar.ftl" as navbar>
diff --git a/src/main/resources/templates/accounts/accounts.ftl b/src/main/resources/templates/accounts/accounts.ftl
index 92008fa2e..5252e0006 100644
--- a/src/main/resources/templates/accounts/accounts.ftl
+++ b/src/main/resources/templates/accounts/accounts.ftl
@@ -2,7 +2,7 @@
<head>
<#import "../helpers/header.ftl" as header>
<@header.globals/>
- <@header.header "BudgetMaster"/>
+ <@header.header "BudgetMaster - ${locale.getString('menu.accounts')}"/>
<#import "/spring.ftl" as s>
</head>
<body class="budgetmaster-blue-light">
diff --git a/src/main/resources/templates/accounts/newAccount.ftl b/src/main/resources/templates/accounts/newAccount.ftl
index d2bcee515..984a8475f 100644
--- a/src/main/resources/templates/accounts/newAccount.ftl
+++ b/src/main/resources/templates/accounts/newAccount.ftl
@@ -2,7 +2,14 @@
<head>
<#import "../helpers/header.ftl" as header>
<@header.globals/>
- <@header.header "BudgetMaster"/>
+
+ <#if account.getID()??>
+ <#assign title=locale.getString("title.account.edit")/>
+ <#else>
+ <#assign title=locale.getString("title.account.new")/>
+ </#if>
+
+ <@header.header "BudgetMaster - ${title}"/>
<#import "/spring.ftl" as s>
</head>
<body class="budgetmaster-blue-light">
@@ -13,7 +20,7 @@
<div class="card main-card background-color">
<div class="container">
<div class="section center-align">
- <div class="headline"><#if account.getID()??>${locale.getString("title.account.edit")}<#else>${locale.getString("title.account.new")}</#if></div>
+ <div class="headline">${title}</div>
</div>
</div>
<div class="container">
diff --git a/src/main/resources/templates/categories/categories.ftl b/src/main/resources/templates/categories/categories.ftl
index 0ed165bfd..26a1d89e4 100644
--- a/src/main/resources/templates/categories/categories.ftl
+++ b/src/main/resources/templates/categories/categories.ftl
@@ -2,7 +2,7 @@
<head>
<#import "../helpers/header.ftl" as header>
<@header.globals/>
- <@header.header "BudgetMaster"/>
+ <@header.header "BudgetMaster - ${locale.getString('menu.categories')}"/>
<@header.style "categories"/>
<#import "/spring.ftl" as s>
</head>
diff --git a/src/main/resources/templates/categories/newCategory.ftl b/src/main/resources/templates/categories/newCategory.ftl
index 62f5ff912..259360272 100644
--- a/src/main/resources/templates/categories/newCategory.ftl
+++ b/src/main/resources/templates/categories/newCategory.ftl
@@ -4,7 +4,14 @@
<#import "../helpers/header.ftl" as header>
<@header.globals/>
- <@header.header "BudgetMaster"/>
+
+ <#if category.getID()??>
+ <#assign title=locale.getString("title.category.edit")/>
+ <#else>
+ <#assign title=locale.getString("title.category.new")/>
+ </#if>
+
+ <@header.header "BudgetMaster - ${title}"/>
<link type="text/css" rel="stylesheet" href="<@s.url '${"/css/libs/spectrum.css"}'/>"/>
<@header.style "categories"/>
</head>
@@ -18,7 +25,7 @@
<div class="card main-card background-color">
<div class="container">
<div class="section center-align">
- <div class="headline"><#if category.getID()??>${locale.getString("title.category.edit")}<#else>${locale.getString("title.category.new")}</#if></div>
+ <div class="headline">${title}</div>
</div>
</div>
<div class="container">
diff --git a/src/main/resources/templates/charts/charts.ftl b/src/main/resources/templates/charts/charts.ftl
index 482183b99..f18bea20d 100644
--- a/src/main/resources/templates/charts/charts.ftl
+++ b/src/main/resources/templates/charts/charts.ftl
@@ -2,7 +2,7 @@
<head>
<#import "../helpers/header.ftl" as header>
<@header.globals/>
- <@header.header "BudgetMaster"/>
+ <@header.header "BudgetMaster - ${locale.getString('menu.charts')}"/>
<@header.style "datepicker"/>
<@header.style "collapsible"/>
<@header.style "charts"/>
diff --git a/src/main/resources/templates/charts/manage.ftl b/src/main/resources/templates/charts/manage.ftl
index dfa374710..a6add3c53 100644
--- a/src/main/resources/templates/charts/manage.ftl
+++ b/src/main/resources/templates/charts/manage.ftl
@@ -2,7 +2,7 @@
<head>
<#import "../helpers/header.ftl" as header>
<@header.globals/>
- <@header.header "BudgetMaster"/>
+ <@header.header "BudgetMaster - ${locale.getString('menu.charts')}"/>
<#import "/spring.ftl" as s>
</head>
<body class="budgetmaster-blue-light">
diff --git a/src/main/resources/templates/charts/newChart.ftl b/src/main/resources/templates/charts/newChart.ftl
index 1972977c0..b284ffb2b 100644
--- a/src/main/resources/templates/charts/newChart.ftl
+++ b/src/main/resources/templates/charts/newChart.ftl
@@ -2,7 +2,14 @@
<head>
<#import "../helpers/header.ftl" as header>
<@header.globals/>
- <@header.header "BudgetMaster"/>
+
+ <#if chart.getID()??>
+ <#assign title=locale.getString("title.chart.edit")/>
+ <#else>
+ <#assign title=locale.getString("title.chart.new")/>
+ </#if>
+
+ <@header.header "BudgetMaster - ${title}"/>
<#import "/spring.ftl" as s>
<link rel="stylesheet" href="<@s.url "/webjars/codemirror/5.50.0/lib/codemirror.css"/>">
<@header.style "charts"/>
@@ -17,7 +24,7 @@
<div class="card main-card background-color">
<div class="container">
<div class="section center-align">
- <div class="headline"><#if chart.getID()??>${locale.getString("title.chart.edit")}<#else>${locale.getString("title.chart.new")}</#if></div>
+ <div class="headline">${title}</div>
</div>
</div>
<div class="container">
diff --git a/src/main/resources/templates/firstUse.ftl b/src/main/resources/templates/firstUse.ftl
index 684ec8577..0c5638a6c 100644
--- a/src/main/resources/templates/firstUse.ftl
+++ b/src/main/resources/templates/firstUse.ftl
@@ -2,7 +2,7 @@
<head>
<#import "helpers/header.ftl" as header>
<@header.globals/>
- <@header.header "BudgetMaster"/>
+ <@header.header "BudgetMaster - ${locale.getString('menu.firstUseGuide')}"/>
<#import "/spring.ftl" as s>
</head>
<body class="budgetmaster-blue-light">
diff --git a/src/main/resources/templates/hotkeys.ftl b/src/main/resources/templates/hotkeys.ftl
index bbd4e01d2..1b6915760 100644
--- a/src/main/resources/templates/hotkeys.ftl
+++ b/src/main/resources/templates/hotkeys.ftl
@@ -2,7 +2,7 @@
<head>
<#import "helpers/header.ftl" as header>
<@header.globals/>
- <@header.header "BudgetMaster"/>
+ <@header.header "BudgetMaster - ${locale.getString('menu.hotkeys')}"/>
<@header.style "hotkeys"/>
</head>
<body class="budgetmaster-blue-light">
diff --git a/src/main/resources/templates/login.ftl b/src/main/resources/templates/login.ftl
index 68ecfdc83..e5b9699a4 100644
--- a/src/main/resources/templates/login.ftl
+++ b/src/main/resources/templates/login.ftl
@@ -2,7 +2,7 @@
<head>
<#import "helpers/header.ftl" as header>
<@header.globals/>
- <@header.header "BudgetMaster"/>
+ <@header.header "BudgetMaster - ${locale.getString('login.button')}"/>
<@header.style "login"/>
<#import "/spring.ftl" as s>
</head>
diff --git a/src/main/resources/templates/reports/reports.ftl b/src/main/resources/templates/reports/reports.ftl
index 26dafa989..a75dcf57d 100644
--- a/src/main/resources/templates/reports/reports.ftl
+++ b/src/main/resources/templates/reports/reports.ftl
@@ -2,7 +2,7 @@
<head>
<#import "../helpers/header.ftl" as header>
<@header.globals/>
- <@header.header "BudgetMaster"/>
+ <@header.header "BudgetMaster - ${locale.getString('menu.reports')}"/>
<@header.style "reports"/>
<@header.style "globalDatepicker"/>
<@header.style "collapsible"/>
diff --git a/src/main/resources/templates/search/search.ftl b/src/main/resources/templates/search/search.ftl
index b6400c1ad..be3867481 100644
--- a/src/main/resources/templates/search/search.ftl
+++ b/src/main/resources/templates/search/search.ftl
@@ -2,7 +2,7 @@
<head>
<#import "../helpers/header.ftl" as header>
<@header.globals/>
- <@header.header "BudgetMaster"/>
+ <@header.header "BudgetMaster - ${locale.getString('search')}"/>
<@header.style "transactions"/>
<@header.style "categories"/>
<@header.style "search"/>
diff --git a/src/main/resources/templates/settings/import.ftl b/src/main/resources/templates/settings/import.ftl
index ac42815c5..0d6b872c3 100644
--- a/src/main/resources/templates/settings/import.ftl
+++ b/src/main/resources/templates/settings/import.ftl
@@ -2,7 +2,7 @@
<head>
<#import "../helpers/header.ftl" as header>
<@header.globals/>
- <@header.header "BudgetMaster"/>
+ <@header.header "BudgetMaster - ${locale.getString('settings.database.import')}"/>
<#import "/spring.ftl" as s>
</head>
<body class="budgetmaster-blue-light">
diff --git a/src/main/resources/templates/settings/settings.ftl b/src/main/resources/templates/settings/settings.ftl
index 55de2f615..a74b0e8dc 100644
--- a/src/main/resources/templates/settings/settings.ftl
+++ b/src/main/resources/templates/settings/settings.ftl
@@ -2,7 +2,7 @@
<head>
<#import "../helpers/header.ftl" as header>
<@header.globals/>
- <@header.header "BudgetMaster"/>
+ <@header.header "BudgetMaster - ${locale.getString('menu.settings')}"/>
<@header.style "settings"/>
<#import "/spring.ftl" as s>
</head>
diff --git a/src/main/resources/templates/templates/newTemplate.ftl b/src/main/resources/templates/templates/newTemplate.ftl
index 66b75b8dd..319a80230 100644
--- a/src/main/resources/templates/templates/newTemplate.ftl
+++ b/src/main/resources/templates/templates/newTemplate.ftl
@@ -2,7 +2,13 @@
<head>
<#import "../helpers/header.ftl" as header>
<@header.globals/>
- <@header.header "BudgetMaster"/>
+ <#if isEdit>
+ <#assign title=locale.getString("title.template.edit")/>
+ <#else>
+ <#assign title=locale.getString("title.template.new")/>
+ </#if>
+
+ <@header.header "BudgetMaster - ${title}"/>
<@header.style "transactions"/>
<@header.style "datepicker"/>
<@header.style "categories"/>
@@ -20,7 +26,7 @@
<div class="card main-card background-color">
<div class="container">
<div class="section center-align">
- <div class="headline"><#if isEdit>${locale.getString("title.template.edit")}<#else>${locale.getString("title.template.new")}</#if></div>
+ <div class="headline">${title}</div>
</div>
</div>
<div class="container">
diff --git a/src/main/resources/templates/templates/templates.ftl b/src/main/resources/templates/templates/templates.ftl
index 859dc2e1f..5266e7ea5 100644
--- a/src/main/resources/templates/templates/templates.ftl
+++ b/src/main/resources/templates/templates/templates.ftl
@@ -2,7 +2,7 @@
<head>
<#import "../helpers/header.ftl" as header>
<@header.globals/>
- <@header.header "BudgetMaster"/>
+ <@header.header "BudgetMaster - ${locale.getString('menu.templates')}"/>
<@header.style "collapsible"/>
<@header.style "templates"/>
<#import "/spring.ftl" as s>
diff --git a/src/main/resources/templates/transactions/newTransactionNormal.ftl b/src/main/resources/templates/transactions/newTransactionNormal.ftl
index 2f1cf4e44..9de5fcfaf 100644
--- a/src/main/resources/templates/transactions/newTransactionNormal.ftl
+++ b/src/main/resources/templates/transactions/newTransactionNormal.ftl
@@ -2,7 +2,14 @@
<head>
<#import "../helpers/header.ftl" as header>
<@header.globals/>
- <@header.header "BudgetMaster"/>
+ <#assign title = locale.getString("title.transaction.new.normal")/>
+ <#if isEdit>
+ <#assign title=locale.getString("title.transaction.edit", title)/>
+ <#else>
+ <#assign title=locale.getString("title.transaction.new", title)/>
+ </#if>
+
+ <@header.header "BudgetMaster - ${title}"/>
<@header.style "transactions"/>
<@header.style "datepicker"/>
<@header.style "categories"/>
@@ -19,8 +26,7 @@
<div class="card main-card background-color">
<div class="container">
<div class="section center-align">
- <#assign title = locale.getString("title.transaction.new.normal")/>
- <div class="headline"><#if isEdit>${locale.getString("title.transaction.edit", title)}<#else>${locale.getString("title.transaction.new", title)}</#if></div>
+ <div class="headline">${title}</div>
</div>
</div>
<div class="container">
diff --git a/src/main/resources/templates/transactions/newTransactionRepeating.ftl b/src/main/resources/templates/transactions/newTransactionRepeating.ftl
index ac2af6bd8..2ccd84503 100644
--- a/src/main/resources/templates/transactions/newTransactionRepeating.ftl
+++ b/src/main/resources/templates/transactions/newTransactionRepeating.ftl
@@ -2,7 +2,14 @@
<head>
<#import "../helpers/header.ftl" as header>
<@header.globals/>
- <@header.header "BudgetMaster"/>
+ <#assign title = locale.getString("title.transaction.new.repeating.long")/>
+ <#if isEdit>
+ <#assign title=locale.getString("title.transaction.edit", title)/>
+ <#else>
+ <#assign title=locale.getString("title.transaction.new", title)/>
+ </#if>
+
+ <@header.header "BudgetMaster - ${title}"/>
<@header.style "transactions"/>
<@header.style "datepicker"/>
<@header.style "categories"/>
@@ -18,8 +25,7 @@
<div class="card main-card background-color">
<div class="container">
<div class="section center-align">
- <#assign title = locale.getString("title.transaction.new.repeating.long")/>
- <div class="headline"><#if isEdit>${locale.getString("title.transaction.edit", title)}<#else>${locale.getString("title.transaction.new", title)}</#if></div>
+ <div class="headline">${title}</div>
</div>
</div>
<div class="container">
diff --git a/src/main/resources/templates/transactions/newTransactionTransfer.ftl b/src/main/resources/templates/transactions/newTransactionTransfer.ftl
index 862272589..98590a583 100644
--- a/src/main/resources/templates/transactions/newTransactionTransfer.ftl
+++ b/src/main/resources/templates/transactions/newTransactionTransfer.ftl
@@ -2,7 +2,14 @@
<head>
<#import "../helpers/header.ftl" as header>
<@header.globals/>
- <@header.header "BudgetMaster"/>
+ <#assign title = locale.getString("title.transaction.new.transfer")/>
+ <#if isEdit>
+ <#assign title=locale.getString("title.transaction.edit", title)/>
+ <#else>
+ <#assign title=locale.getString("title.transaction.new", title)/>
+ </#if>
+
+ <@header.header "BudgetMaster - ${title}"/>
<@header.style "transactions"/>
<@header.style "datepicker"/>
<@header.style "categories"/>
@@ -19,8 +26,7 @@
<div class="card main-card background-color">
<div class="container">
<div class="section center-align">
- <#assign title = locale.getString("title.transaction.new.transfer")/>
- <div class="headline"><#if isEdit>${locale.getString("title.transaction.edit", title)}<#else>${locale.getString("title.transaction.new", title)}</#if></div>
+ <div class="headline">${title}</div>
</div>
</div>
<div class="container">
diff --git a/src/main/resources/templates/transactions/transactions.ftl b/src/main/resources/templates/transactions/transactions.ftl
index 0083dc2d1..18c9a7cff 100644
--- a/src/main/resources/templates/transactions/transactions.ftl
+++ b/src/main/resources/templates/transactions/transactions.ftl
@@ -2,7 +2,7 @@
<head>
<#import "../helpers/header.ftl" as header>
<@header.globals/>
- <@header.header "BudgetMaster"/>
+ <@header.header "BudgetMaster - ${locale.getString('menu.transactions')}"/>
<@header.style "categories"/>
<@header.style "transactions"/>
<@header.style "globalDatepicker"/>
--
GitLab