From 88214d29da61f211a5d1548819fb3edf27d09357 Mon Sep 17 00:00:00 2001
From: Robert Goldmann <deadlocker@gmx.de>
Date: Thu, 10 Dec 2020 21:27:57 +0100
Subject: [PATCH] #569 - externalized globals to own macro
---
src/main/resources/templates/about.ftl | 1 +
.../resources/templates/accounts/accounts.ftl | 3 ++-
.../templates/accounts/newAccount.ftl | 3 ++-
.../templates/categories/categories.ftl | 3 ++-
.../templates/categories/newCategory.ftl | 3 ++-
.../resources/templates/charts/charts.ftl | 3 ++-
.../resources/templates/charts/manage.ftl | 3 ++-
.../resources/templates/charts/newChart.ftl | 3 ++-
src/main/resources/templates/error/400.ftl | 1 +
src/main/resources/templates/error/403.ftl | 1 +
src/main/resources/templates/error/404.ftl | 1 +
src/main/resources/templates/error/418.ftl | 1 +
src/main/resources/templates/error/500.ftl | 1 +
src/main/resources/templates/firstUse.ftl | 3 ++-
.../resources/templates/helpers/header.ftl | 21 +++++++++++--------
src/main/resources/templates/hotkeys.ftl | 3 ++-
src/main/resources/templates/index.ftl | 3 ++-
src/main/resources/templates/login.ftl | 3 ++-
.../templates/placeholder/comingSoon.ftl | 3 ++-
.../templates/placeholder/emptyPage.ftl | 3 ++-
.../resources/templates/reports/reports.ftl | 3 ++-
.../resources/templates/search/search.ftl | 3 ++-
.../resources/templates/settings/import.ftl | 3 ++-
.../resources/templates/settings/settings.ftl | 3 ++-
.../templates/templates/newTemplate.ftl | 3 ++-
.../templates/templates/templates.ftl | 3 ++-
.../transactions/newTransactionNormal.ftl | 3 ++-
.../transactions/newTransactionRepeating.ftl | 3 ++-
.../transactions/newTransactionTransfer.ftl | 3 ++-
.../templates/transactions/transactions.ftl | 3 ++-
30 files changed, 64 insertions(+), 32 deletions(-)
diff --git a/src/main/resources/templates/about.ftl b/src/main/resources/templates/about.ftl
index 6230a55a8..01076cdc8 100644
--- a/src/main/resources/templates/about.ftl
+++ b/src/main/resources/templates/about.ftl
@@ -1,6 +1,7 @@
<html>
<head>
<#import "helpers/header.ftl" as header>
+ <@header.globals/>
<@header.header "BudgetMaster"/>
</head>
<body class="budgetmaster-blue-light">
diff --git a/src/main/resources/templates/accounts/accounts.ftl b/src/main/resources/templates/accounts/accounts.ftl
index e0aaf6484..92008fa2e 100644
--- a/src/main/resources/templates/accounts/accounts.ftl
+++ b/src/main/resources/templates/accounts/accounts.ftl
@@ -1,7 +1,8 @@
<html>
<head>
<#import "../helpers/header.ftl" as header>
- <@header.header "BudgetMaster"/>
+ <@header.globals/>
+ <@header.header "BudgetMaster"/>
<#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 671d1a901..d2bcee515 100644
--- a/src/main/resources/templates/accounts/newAccount.ftl
+++ b/src/main/resources/templates/accounts/newAccount.ftl
@@ -1,7 +1,8 @@
<html>
<head>
<#import "../helpers/header.ftl" as header>
- <@header.header "BudgetMaster"/>
+ <@header.globals/>
+ <@header.header "BudgetMaster"/>
<#import "/spring.ftl" as s>
</head>
<body class="budgetmaster-blue-light">
diff --git a/src/main/resources/templates/categories/categories.ftl b/src/main/resources/templates/categories/categories.ftl
index 22ee9522f..0ed165bfd 100644
--- a/src/main/resources/templates/categories/categories.ftl
+++ b/src/main/resources/templates/categories/categories.ftl
@@ -1,7 +1,8 @@
<html>
<head>
<#import "../helpers/header.ftl" as header>
- <@header.header "BudgetMaster"/>
+ <@header.globals/>
+ <@header.header "BudgetMaster"/>
<@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 855734f5b..62f5ff912 100644
--- a/src/main/resources/templates/categories/newCategory.ftl
+++ b/src/main/resources/templates/categories/newCategory.ftl
@@ -3,7 +3,8 @@
<#import "/spring.ftl" as s>
<#import "../helpers/header.ftl" as header>
- <@header.header "BudgetMaster"/>
+ <@header.globals/>
+ <@header.header "BudgetMaster"/>
<link type="text/css" rel="stylesheet" href="<@s.url '${"/css/libs/spectrum.css"}'/>"/>
<@header.style "categories"/>
</head>
diff --git a/src/main/resources/templates/charts/charts.ftl b/src/main/resources/templates/charts/charts.ftl
index cf711c1fa..482183b99 100644
--- a/src/main/resources/templates/charts/charts.ftl
+++ b/src/main/resources/templates/charts/charts.ftl
@@ -1,7 +1,8 @@
<html>
<head>
<#import "../helpers/header.ftl" as header>
- <@header.header "BudgetMaster"/>
+ <@header.globals/>
+ <@header.header "BudgetMaster"/>
<@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 cb491756f..dfa374710 100644
--- a/src/main/resources/templates/charts/manage.ftl
+++ b/src/main/resources/templates/charts/manage.ftl
@@ -1,7 +1,8 @@
<html>
<head>
<#import "../helpers/header.ftl" as header>
- <@header.header "BudgetMaster"/>
+ <@header.globals/>
+ <@header.header "BudgetMaster"/>
<#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 ba8fbdd16..1972977c0 100644
--- a/src/main/resources/templates/charts/newChart.ftl
+++ b/src/main/resources/templates/charts/newChart.ftl
@@ -1,7 +1,8 @@
<html>
<head>
<#import "../helpers/header.ftl" as header>
- <@header.header "BudgetMaster"/>
+ <@header.globals/>
+ <@header.header "BudgetMaster"/>
<#import "/spring.ftl" as s>
<link rel="stylesheet" href="<@s.url "/webjars/codemirror/5.50.0/lib/codemirror.css"/>">
<@header.style "charts"/>
diff --git a/src/main/resources/templates/error/400.ftl b/src/main/resources/templates/error/400.ftl
index 03219beb1..15d3cc46c 100644
--- a/src/main/resources/templates/error/400.ftl
+++ b/src/main/resources/templates/error/400.ftl
@@ -1,6 +1,7 @@
<html>
<head>
<#import "../helpers/header.ftl" as header>
+ <@header.globals/>
<@header.header "BudgetMaster - 400"/>
<@header.style "login"/>
<#import "/spring.ftl" as s>
diff --git a/src/main/resources/templates/error/403.ftl b/src/main/resources/templates/error/403.ftl
index 739ecdb6b..6126a37c5 100644
--- a/src/main/resources/templates/error/403.ftl
+++ b/src/main/resources/templates/error/403.ftl
@@ -1,6 +1,7 @@
<html>
<head>
<#import "../helpers/header.ftl" as header>
+ <@header.globals/>
<@header.header "BudgetMaster - 403"/>
<@header.style "login"/>
<#import "/spring.ftl" as s>
diff --git a/src/main/resources/templates/error/404.ftl b/src/main/resources/templates/error/404.ftl
index 731c809d1..eec84613a 100644
--- a/src/main/resources/templates/error/404.ftl
+++ b/src/main/resources/templates/error/404.ftl
@@ -1,6 +1,7 @@
<html>
<head>
<#import "../helpers/header.ftl" as header>
+ <@header.globals/>
<@header.header "BudgetMaster - 404"/>
<@header.style "login"/>
<#import "/spring.ftl" as s>
diff --git a/src/main/resources/templates/error/418.ftl b/src/main/resources/templates/error/418.ftl
index d6ec27ea5..35345ff77 100644
--- a/src/main/resources/templates/error/418.ftl
+++ b/src/main/resources/templates/error/418.ftl
@@ -1,6 +1,7 @@
<html>
<head>
<#import "../helpers/header.ftl" as header>
+ <@header.globals/>
<@header.header "BudgetMaster - 418"/>
<@header.style "login"/>
<#import "/spring.ftl" as s>
diff --git a/src/main/resources/templates/error/500.ftl b/src/main/resources/templates/error/500.ftl
index 947f71173..dce608659 100644
--- a/src/main/resources/templates/error/500.ftl
+++ b/src/main/resources/templates/error/500.ftl
@@ -1,6 +1,7 @@
<html>
<head>
<#import "../helpers/header.ftl" as header>
+ <@header.globals/>
<@header.header "BudgetMaster - 500"/>
<@header.style "login"/>
<#import "/spring.ftl" as s>
diff --git a/src/main/resources/templates/firstUse.ftl b/src/main/resources/templates/firstUse.ftl
index 89b5a3b7f..684ec8577 100644
--- a/src/main/resources/templates/firstUse.ftl
+++ b/src/main/resources/templates/firstUse.ftl
@@ -1,7 +1,8 @@
<html>
<head>
<#import "helpers/header.ftl" as header>
- <@header.header "BudgetMaster"/>
+ <@header.globals/>
+ <@header.header "BudgetMaster"/>
<#import "/spring.ftl" as s>
</head>
<body class="budgetmaster-blue-light">
diff --git a/src/main/resources/templates/helpers/header.ftl b/src/main/resources/templates/helpers/header.ftl
index c9f77b6cd..585dcad17 100644
--- a/src/main/resources/templates/helpers/header.ftl
+++ b/src/main/resources/templates/helpers/header.ftl
@@ -7,15 +7,7 @@
</#if>
</#macro>
-<#macro header title>
- <#import "/spring.ftl" as s>
- <title>${title}</title>
- <meta charset="UTF-8"/>
- <link rel="stylesheet" href="<@s.url '/webjars/font-awesome/5.15.1/css/all.min.css'/>">
- <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
- <link rel="stylesheet" href="<@s.url "/webjars/materializecss/1.0.0/css/materialize.min.css"/>">
- <@style "style"/>
- <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+<#macro globals>
<#global locale = static["de.thecodelabs.utils.util.Localization"]>
<#global programArgs = static["de.deadlocker8.budgetmaster.ProgramArgs"]>
@@ -28,6 +20,17 @@
</#if>
</#macro>
+<#macro header title>
+ <#import "/spring.ftl" as s>
+ <title>${title}</title>
+ <meta charset="UTF-8"/>
+ <link rel="stylesheet" href="<@s.url '/webjars/font-awesome/5.15.1/css/all.min.css'/>">
+ <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
+ <link rel="stylesheet" href="<@s.url "/webjars/materializecss/1.0.0/css/materialize.min.css"/>">
+ <@style "style"/>
+ <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
+</#macro>
+
<#macro logo id classes>
<#import "/spring.ftl" as s>
<#if helpers.getSettings().isUseDarkTheme()>
diff --git a/src/main/resources/templates/hotkeys.ftl b/src/main/resources/templates/hotkeys.ftl
index 5126e551f..bbd4e01d2 100644
--- a/src/main/resources/templates/hotkeys.ftl
+++ b/src/main/resources/templates/hotkeys.ftl
@@ -1,7 +1,8 @@
<html>
<head>
<#import "helpers/header.ftl" as header>
- <@header.header "BudgetMaster"/>
+ <@header.globals/>
+ <@header.header "BudgetMaster"/>
<@header.style "hotkeys"/>
</head>
<body class="budgetmaster-blue-light">
diff --git a/src/main/resources/templates/index.ftl b/src/main/resources/templates/index.ftl
index c7f67f48b..4a909bb66 100644
--- a/src/main/resources/templates/index.ftl
+++ b/src/main/resources/templates/index.ftl
@@ -1,7 +1,8 @@
<html>
<head>
<#import "helpers/header.ftl" as header>
- <@header.header "BudgetMaster"/>
+ <@header.globals/>
+ <@header.header "BudgetMaster"/>
<#import "/spring.ftl" as s>
</head>
<body class="budgetmaster-blue-light">
diff --git a/src/main/resources/templates/login.ftl b/src/main/resources/templates/login.ftl
index e1547d053..68ecfdc83 100644
--- a/src/main/resources/templates/login.ftl
+++ b/src/main/resources/templates/login.ftl
@@ -1,7 +1,8 @@
<html>
<head>
<#import "helpers/header.ftl" as header>
- <@header.header "BudgetMaster"/>
+ <@header.globals/>
+ <@header.header "BudgetMaster"/>
<@header.style "login"/>
<#import "/spring.ftl" as s>
</head>
diff --git a/src/main/resources/templates/placeholder/comingSoon.ftl b/src/main/resources/templates/placeholder/comingSoon.ftl
index e9f850672..eae20098d 100644
--- a/src/main/resources/templates/placeholder/comingSoon.ftl
+++ b/src/main/resources/templates/placeholder/comingSoon.ftl
@@ -1,7 +1,8 @@
<html>
<head>
<#import "../helpers/header.ftl" as header>
- <@header.header "BudgetMaster"/>
+ <@header.globals/>
+ <@header.header "BudgetMaster"/>
</head>
<body class="budgetmaster-blue-light">
<#import "../helpers/navbar.ftl" as navbar>
diff --git a/src/main/resources/templates/placeholder/emptyPage.ftl b/src/main/resources/templates/placeholder/emptyPage.ftl
index c1ff49371..2be830518 100644
--- a/src/main/resources/templates/placeholder/emptyPage.ftl
+++ b/src/main/resources/templates/placeholder/emptyPage.ftl
@@ -1,7 +1,8 @@
<html>
<head>
<#import "../helpers/header.ftl" as header>
- <@header.header "BudgetMaster"/>
+ <@header.globals/>
+ <@header.header "BudgetMaster"/>
</head>
<body class="budgetmaster-blue-light">
<#import "../helpers/navbar.ftl" as navbar>
diff --git a/src/main/resources/templates/reports/reports.ftl b/src/main/resources/templates/reports/reports.ftl
index 56081a90e..26dafa989 100644
--- a/src/main/resources/templates/reports/reports.ftl
+++ b/src/main/resources/templates/reports/reports.ftl
@@ -1,7 +1,8 @@
<html>
<head>
<#import "../helpers/header.ftl" as header>
- <@header.header "BudgetMaster"/>
+ <@header.globals/>
+ <@header.header "BudgetMaster"/>
<@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 9d2859033..b6400c1ad 100644
--- a/src/main/resources/templates/search/search.ftl
+++ b/src/main/resources/templates/search/search.ftl
@@ -1,7 +1,8 @@
<html>
<head>
<#import "../helpers/header.ftl" as header>
- <@header.header "BudgetMaster"/>
+ <@header.globals/>
+ <@header.header "BudgetMaster"/>
<@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 119e10474..ac42815c5 100644
--- a/src/main/resources/templates/settings/import.ftl
+++ b/src/main/resources/templates/settings/import.ftl
@@ -1,7 +1,8 @@
<html>
<head>
<#import "../helpers/header.ftl" as header>
- <@header.header "BudgetMaster"/>
+ <@header.globals/>
+ <@header.header "BudgetMaster"/>
<#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 95c6b0383..55de2f615 100644
--- a/src/main/resources/templates/settings/settings.ftl
+++ b/src/main/resources/templates/settings/settings.ftl
@@ -1,7 +1,8 @@
<html>
<head>
<#import "../helpers/header.ftl" as header>
- <@header.header "BudgetMaster"/>
+ <@header.globals/>
+ <@header.header "BudgetMaster"/>
<@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 42fea8906..66b75b8dd 100644
--- a/src/main/resources/templates/templates/newTemplate.ftl
+++ b/src/main/resources/templates/templates/newTemplate.ftl
@@ -1,7 +1,8 @@
<html>
<head>
<#import "../helpers/header.ftl" as header>
- <@header.header "BudgetMaster"/>
+ <@header.globals/>
+ <@header.header "BudgetMaster"/>
<@header.style "transactions"/>
<@header.style "datepicker"/>
<@header.style "categories"/>
diff --git a/src/main/resources/templates/templates/templates.ftl b/src/main/resources/templates/templates/templates.ftl
index 6d87982fa..859dc2e1f 100644
--- a/src/main/resources/templates/templates/templates.ftl
+++ b/src/main/resources/templates/templates/templates.ftl
@@ -1,7 +1,8 @@
<html>
<head>
<#import "../helpers/header.ftl" as header>
- <@header.header "BudgetMaster"/>
+ <@header.globals/>
+ <@header.header "BudgetMaster"/>
<@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 b10d4e96e..2f1cf4e44 100644
--- a/src/main/resources/templates/transactions/newTransactionNormal.ftl
+++ b/src/main/resources/templates/transactions/newTransactionNormal.ftl
@@ -1,7 +1,8 @@
<html>
<head>
<#import "../helpers/header.ftl" as header>
- <@header.header "BudgetMaster"/>
+ <@header.globals/>
+ <@header.header "BudgetMaster"/>
<@header.style "transactions"/>
<@header.style "datepicker"/>
<@header.style "categories"/>
diff --git a/src/main/resources/templates/transactions/newTransactionRepeating.ftl b/src/main/resources/templates/transactions/newTransactionRepeating.ftl
index a62a7ee6a..ac2af6bd8 100644
--- a/src/main/resources/templates/transactions/newTransactionRepeating.ftl
+++ b/src/main/resources/templates/transactions/newTransactionRepeating.ftl
@@ -1,7 +1,8 @@
<html>
<head>
<#import "../helpers/header.ftl" as header>
- <@header.header "BudgetMaster"/>
+ <@header.globals/>
+ <@header.header "BudgetMaster"/>
<@header.style "transactions"/>
<@header.style "datepicker"/>
<@header.style "categories"/>
diff --git a/src/main/resources/templates/transactions/newTransactionTransfer.ftl b/src/main/resources/templates/transactions/newTransactionTransfer.ftl
index 7c875bad4..862272589 100644
--- a/src/main/resources/templates/transactions/newTransactionTransfer.ftl
+++ b/src/main/resources/templates/transactions/newTransactionTransfer.ftl
@@ -1,7 +1,8 @@
<html>
<head>
<#import "../helpers/header.ftl" as header>
- <@header.header "BudgetMaster"/>
+ <@header.globals/>
+ <@header.header "BudgetMaster"/>
<@header.style "transactions"/>
<@header.style "datepicker"/>
<@header.style "categories"/>
diff --git a/src/main/resources/templates/transactions/transactions.ftl b/src/main/resources/templates/transactions/transactions.ftl
index e985582f0..0083dc2d1 100644
--- a/src/main/resources/templates/transactions/transactions.ftl
+++ b/src/main/resources/templates/transactions/transactions.ftl
@@ -1,7 +1,8 @@
<html>
<head>
<#import "../helpers/header.ftl" as header>
- <@header.header "BudgetMaster"/>
+ <@header.globals/>
+ <@header.header "BudgetMaster"/>
<@header.style "categories"/>
<@header.style "transactions"/>
<@header.style "globalDatepicker"/>
--
GitLab