diff --git a/src/main/resources/templates/about.ftl b/src/main/resources/templates/about.ftl index 6230a55a86e1a72da2a3c98ca698dec7f5bcc784..01076cdc83f7f75240d590207c98669b3fc4d1b1 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 e0aaf64843f4eef044406efe6ffbd6ffb8e9c264..92008fa2e046fad7de786578c7af716d4c5d9dbf 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 671d1a9016c9d9cefb196726a4fa88bad1443a10..d2bcee51564cce2c28288f2582a6f3ad5b002cf4 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 22ee9522f2227e13f498aa2d222aafdc848d63f9..0ed165bfd000ddfdbce664a5ad34f91605d151d3 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 855734f5be82c5da43ec1f54f658aafc16e0abe5..62f5ff912a1465cb82e8d7cf187c0a6457721af1 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 cf711c1fa1ef165bf0d4847371984e8d9a24a401..482183b9983970076256bd30d249cedbee00013a 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 cb491756f94dce75a2280e8fbb79b5ce74d03a00..dfa374710f245c92f7ec809f773853e3bd250b68 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 ba8fbdd16a631a949de61eae7a24cda24a5fa421..1972977c071d2c68cbb94c5729e80ca34bc66aa1 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 03219beb1d551a9224508caf5033229325147c23..15d3cc46c4b0a2aef7c8db92c83610e8a9a22e4c 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 739ecdb6ba2d1bcb9236bbaafcb0c9e30255bc89..6126a37c558e3567e307a4fe672fdd8a46525656 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 731c809d1dcb14d19f18fd8a6deffbda8e8129d1..eec84613a0c8f6dd9337b3dc8d035487e143b849 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 d6ec27ea5eb6b3f070c7a9ba5a5b0e41bb7dd847..35345ff7711cbd5996e2ad0b1e07b069eff37606 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 947f711739b21f7349d629ae0c53e2689dd3f87e..dce60865978927e2a342fb20f12b424945cd6af8 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 89b5a3b7f204dd370cb6f6b0a8045ef146fb4a46..684ec857750771b227276014c9a65b27e71d406e 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 c9f77b6cd2e771280c7e97de614b54fb98f4386d..585dcad171ded061dae99f115bd373e81b5f7aae 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 5126e551f7059db810887e9a9eb56254b634e9a2..bbd4e01d2f0099a723b36b1271952c3dbe2cb87d 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 c7f67f48be85b899574052f19675bfbc08213538..4a909bb6657727e0a9eac8c4e1652e9c0ac2c78c 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 e1547d05360e4c401ead497affb2c70e5de07351..68ecfdc83e621e20819517fd95e5c198ae8822e2 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 e9f850672fd9db22c366d772629731035383c054..eae20098d5e0c3a4288bc095f6db0ef81d6f792a 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 c1ff49371de779efa929c3d4390591e058b09fec..2be830518635c7b447c59ffed591110d1dcb7e77 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 56081a90e0ecba4d284c453e3d3166366c4303b7..26dafa98906902a34733ca9853406a031a1774c3 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 9d2859033549fcd4223c194983ce3d5f82dc7c6f..b6400c1ad3a18dedbe1e488fb7ce096087485efd 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 119e10474d03f9a529bb1080dbbf273f5d1ad990..ac42815c53495894a2f2799de8042ee819c3fd0a 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 95c6b03835fcab6af25a36d9b788434058e4054a..55de2f615ea544929f36b54d6866ce8bfc1726a0 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 42fea8906260cb7c6cf57444d34959bf17420157..66b75b8ddd74a77e9afcb523fa7ac22c86357496 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 6d87982fab93fdc237eb56f9cc4cbd951c531cae..859dc2e1ff33a997d6aa8a39073ede4d323b000b 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 b10d4e96e38ea88bebf773f1e302ab9ed71863c9..2f1cf4e441607329067a5317ac4693b2d59b54eb 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 a62a7ee6a9845cc2f061773a5620e402131ffab5..ac2af6bd814f35aced032caa3546aa42b6544096 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 7c875bad4f5bdf312745b8631e69301e39d9c581..862272589eef82e6c4a196d2fc7a79a969383fc5 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 e985582f00833bd85a377e632d60932349c871d7..0083dc2d16461eb7128bdb944f7c53b2b2c36604 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"/>