From 751df0be8795c1612e497f16ab6da6b9c93165b3 Mon Sep 17 00:00:00 2001 From: Robert Goldmann <deadlocker@gmx.de> Date: Mon, 15 Feb 2021 22:08:07 +0100 Subject: [PATCH] #563 - dynamically load dark theme color constants --- src/main/resources/templates/about.ftl | 4 ++-- src/main/resources/templates/accounts/accounts.ftl | 4 ++-- src/main/resources/templates/accounts/newAccount.ftl | 4 ++-- src/main/resources/templates/categories/categories.ftl | 4 ++-- src/main/resources/templates/categories/newCategory.ftl | 4 ++-- src/main/resources/templates/charts/charts.ftl | 4 ++-- src/main/resources/templates/charts/manage.ftl | 4 ++-- src/main/resources/templates/charts/newChart.ftl | 4 ++-- src/main/resources/templates/error/400.ftl | 4 ++-- src/main/resources/templates/error/403.ftl | 4 ++-- src/main/resources/templates/error/404.ftl | 4 ++-- src/main/resources/templates/error/418.ftl | 4 ++-- src/main/resources/templates/error/500.ftl | 4 ++-- src/main/resources/templates/firstUse.ftl | 4 ++-- src/main/resources/templates/helpers/header.ftl | 6 ++++++ src/main/resources/templates/hotkeys.ftl | 4 ++-- src/main/resources/templates/index.ftl | 4 ++-- src/main/resources/templates/login.ftl | 4 ++-- src/main/resources/templates/placeholder/comingSoon.ftl | 4 ++-- src/main/resources/templates/placeholder/emptyPage.ftl | 4 ++-- src/main/resources/templates/reports/reports.ftl | 4 ++-- src/main/resources/templates/search/search.ftl | 4 ++-- src/main/resources/templates/settings/import.ftl | 4 ++-- src/main/resources/templates/settings/settings.ftl | 4 ++-- src/main/resources/templates/templates/newTemplate.ftl | 4 ++-- src/main/resources/templates/templates/templates.ftl | 4 ++-- .../templates/transactions/newTransactionNormal.ftl | 4 ++-- .../templates/transactions/newTransactionRepeating.ftl | 4 ++-- .../templates/transactions/newTransactionTransfer.ftl | 4 ++-- src/main/resources/templates/transactions/transactions.ftl | 4 ++-- 30 files changed, 64 insertions(+), 58 deletions(-) diff --git a/src/main/resources/templates/about.ftl b/src/main/resources/templates/about.ftl index 1d05e0333..62963f620 100644 --- a/src/main/resources/templates/about.ftl +++ b/src/main/resources/templates/about.ftl @@ -4,7 +4,7 @@ <@header.globals/> <@header.header "BudgetMaster - ${locale.getString('menu.about')}"/> </head> - <body class="budgetmaster-blue-light"> + <@header.body> <#import "helpers/navbar.ftl" as navbar> <@navbar.navbar "about" settings/> <#import "/spring.ftl" as s> @@ -53,7 +53,7 @@ <#import "helpers/scripts.ftl" as scripts> <@scripts.scripts/> <script src="<@s.url '/js/about.js'/>"></script> - </body> + </@header.body> </html> <#macro cellKey key> diff --git a/src/main/resources/templates/accounts/accounts.ftl b/src/main/resources/templates/accounts/accounts.ftl index abfa22914..87f6ec596 100644 --- a/src/main/resources/templates/accounts/accounts.ftl +++ b/src/main/resources/templates/accounts/accounts.ftl @@ -5,7 +5,7 @@ <@header.header "BudgetMaster - ${locale.getString('menu.accounts')}"/> <#import "/spring.ftl" as s> </head> - <body class="budgetmaster-blue-light"> + <@header.body> <#import "../helpers/navbar.ftl" as navbar> <@navbar.navbar "accounts" settings/> @@ -78,5 +78,5 @@ <#import "../helpers/scripts.ftl" as scripts> <@scripts.scripts/> <script src="<@s.url '/js/accounts.js'/>"></script> - </body> + </@header.body> </html> diff --git a/src/main/resources/templates/accounts/newAccount.ftl b/src/main/resources/templates/accounts/newAccount.ftl index 972169b2c..41a2273ae 100644 --- a/src/main/resources/templates/accounts/newAccount.ftl +++ b/src/main/resources/templates/accounts/newAccount.ftl @@ -12,7 +12,7 @@ <@header.header "BudgetMaster - ${title}"/> <#import "/spring.ftl" as s> </head> - <body class="budgetmaster-blue-light"> + <@header.body> <#import "../helpers/navbar.ftl" as navbar> <@navbar.navbar "accounts" settings/> @@ -77,5 +77,5 @@ <#import "../helpers/scripts.ftl" as scripts> <@scripts.scripts/> <script src="<@s.url '/js/accounts.js'/>"></script> - </body> + </@header.body> </html> \ No newline at end of file diff --git a/src/main/resources/templates/categories/categories.ftl b/src/main/resources/templates/categories/categories.ftl index 2ba1fa440..fca30c4fc 100644 --- a/src/main/resources/templates/categories/categories.ftl +++ b/src/main/resources/templates/categories/categories.ftl @@ -6,7 +6,7 @@ <@header.style "categories"/> <#import "/spring.ftl" as s> </head> - <body class="budgetmaster-blue-light"> + <@header.body> <#import "../helpers/navbar.ftl" as navbar> <@navbar.navbar "categories" settings/> @@ -93,7 +93,7 @@ <@scripts.scripts/> <script src="<@s.url '/js/categories.js'/>"></script> <script src="<@s.url '/js/categorySelect.js'/>"></script> - </body> + </@header.body> </html> diff --git a/src/main/resources/templates/categories/newCategory.ftl b/src/main/resources/templates/categories/newCategory.ftl index c4595c224..4e716bf89 100644 --- a/src/main/resources/templates/categories/newCategory.ftl +++ b/src/main/resources/templates/categories/newCategory.ftl @@ -15,7 +15,7 @@ <link type="text/css" rel="stylesheet" href="<@s.url '${"/css/libs/spectrum.css"}'/>"/> <@header.style "categories"/> </head> - <body class="budgetmaster-blue-light"> + <@header.body> <#import "../helpers/navbar.ftl" as navbar> <@navbar.navbar "categories" settings/> @@ -110,5 +110,5 @@ <@scripts.scripts/> <script src="<@s.url '/js/libs/spectrum.js'/>"></script> <script src="<@s.url '/js/categories.js'/>"></script> - </body> + </@header.body> </html> \ No newline at end of file diff --git a/src/main/resources/templates/charts/charts.ftl b/src/main/resources/templates/charts/charts.ftl index 8e9e98a8e..c6be30714 100644 --- a/src/main/resources/templates/charts/charts.ftl +++ b/src/main/resources/templates/charts/charts.ftl @@ -8,7 +8,7 @@ <@header.style "charts"/> <#import "/spring.ftl" as s> </head> - <body class="budgetmaster-blue-light"> + <@header.body> <#import "../helpers/navbar.ftl" as navbar> <@navbar.navbar "charts" settings/> @@ -98,7 +98,7 @@ ${chartScript} </script> </#if> - </body> + </@header.body> </html> diff --git a/src/main/resources/templates/charts/manage.ftl b/src/main/resources/templates/charts/manage.ftl index f6c107af1..94b6495b0 100644 --- a/src/main/resources/templates/charts/manage.ftl +++ b/src/main/resources/templates/charts/manage.ftl @@ -5,7 +5,7 @@ <@header.header "BudgetMaster - ${locale.getString('menu.charts')}"/> <#import "/spring.ftl" as s> </head> - <body class="budgetmaster-blue-light"> + <@header.body> <#import "../helpers/navbar.ftl" as navbar> <@navbar.navbar "charts" settings/> @@ -66,5 +66,5 @@ <#import "../helpers/scripts.ftl" as scripts> <@scripts.scripts/> <script src="<@s.url '/js/charts.js'/>"></script> - </body> + </@header.body> </html> \ No newline at end of file diff --git a/src/main/resources/templates/charts/newChart.ftl b/src/main/resources/templates/charts/newChart.ftl index 4c2e5eb0d..173e2a990 100644 --- a/src/main/resources/templates/charts/newChart.ftl +++ b/src/main/resources/templates/charts/newChart.ftl @@ -14,7 +14,7 @@ <link rel="stylesheet" href="<@s.url "/webjars/codemirror/5.50.0/lib/codemirror.css"/>"> <@header.style "charts"/> </head> - <body class="budgetmaster-blue-light"> + <@header.body> <#import "../helpers/navbar.ftl" as navbar> <@navbar.navbar "charts" settings/> @@ -106,5 +106,5 @@ <script src="<@s.url '/webjars/codemirror/5.50.0/lib/codemirror.js'/>"></script> <script src="<@s.url '/webjars/codemirror/5.50.0/mode/javascript/javascript.js'/>"></script> <script src="<@s.url '/js/charts.js'/>"></script> - </body> + </@header.body> </html> \ No newline at end of file diff --git a/src/main/resources/templates/error/400.ftl b/src/main/resources/templates/error/400.ftl index 15d3cc46c..b66d11075 100644 --- a/src/main/resources/templates/error/400.ftl +++ b/src/main/resources/templates/error/400.ftl @@ -6,7 +6,7 @@ <@header.style "login"/> <#import "/spring.ftl" as s> </head> - <body class="budgetmaster-blue-light"> + <@header.body> <main> <div class="row valign-wrapper full-height"> <div class="col l4 offset-l4 m6 offset-m3 s10 offset-s1"> @@ -29,5 +29,5 @@ </div> </div> </main> - </body> + </@header.body> </html> \ No newline at end of file diff --git a/src/main/resources/templates/error/403.ftl b/src/main/resources/templates/error/403.ftl index 6126a37c5..bcf6f85e8 100644 --- a/src/main/resources/templates/error/403.ftl +++ b/src/main/resources/templates/error/403.ftl @@ -6,7 +6,7 @@ <@header.style "login"/> <#import "/spring.ftl" as s> </head> - <body class="budgetmaster-blue-light"> + <@header.body> <main> <div class="row valign-wrapper full-height"> <div class="col l4 offset-l4 m6 offset-m3 s10 offset-s1"> @@ -29,5 +29,5 @@ </div> </div> </main> - </body> + </@header.body> </html> \ No newline at end of file diff --git a/src/main/resources/templates/error/404.ftl b/src/main/resources/templates/error/404.ftl index eec84613a..00cca924b 100644 --- a/src/main/resources/templates/error/404.ftl +++ b/src/main/resources/templates/error/404.ftl @@ -6,7 +6,7 @@ <@header.style "login"/> <#import "/spring.ftl" as s> </head> - <body class="budgetmaster-blue-light"> + <@header.body> <main> <div class="row valign-wrapper full-height"> <div class="col l4 offset-l4 m6 offset-m3 s10 offset-s1"> @@ -29,5 +29,5 @@ </div> </div> </main> - </body> + </@header.body> </html> \ No newline at end of file diff --git a/src/main/resources/templates/error/418.ftl b/src/main/resources/templates/error/418.ftl index 35345ff77..39bccd513 100644 --- a/src/main/resources/templates/error/418.ftl +++ b/src/main/resources/templates/error/418.ftl @@ -6,7 +6,7 @@ <@header.style "login"/> <#import "/spring.ftl" as s> </head> - <body class="budgetmaster-blue-light"> + <@header.body> <main> <div class="row valign-wrapper full-height"> <div class="col l4 offset-l4 m6 offset-m3 s10 offset-s1"> @@ -35,5 +35,5 @@ <!-- Scripts--> <#import "../helpers/scripts.ftl" as scripts> <@scripts.scripts/> - </body> + </@header.body> </html> \ No newline at end of file diff --git a/src/main/resources/templates/error/500.ftl b/src/main/resources/templates/error/500.ftl index dce608659..e37239873 100644 --- a/src/main/resources/templates/error/500.ftl +++ b/src/main/resources/templates/error/500.ftl @@ -6,7 +6,7 @@ <@header.style "login"/> <#import "/spring.ftl" as s> </head> - <body class="budgetmaster-blue-light"> + <@header.body> <main> <div class="row valign-wrapper full-height"> <div class="col l4 offset-l4 m6 offset-m3 s10 offset-s1"> @@ -33,5 +33,5 @@ <!-- Scripts--> <#import "../helpers/scripts.ftl" as scripts> <@scripts.scripts/> - </body> + </@header.body> </html> \ No newline at end of file diff --git a/src/main/resources/templates/firstUse.ftl b/src/main/resources/templates/firstUse.ftl index 0c5638a6c..9f56150a0 100644 --- a/src/main/resources/templates/firstUse.ftl +++ b/src/main/resources/templates/firstUse.ftl @@ -5,7 +5,7 @@ <@header.header "BudgetMaster - ${locale.getString('menu.firstUseGuide')}"/> <#import "/spring.ftl" as s> </head> - <body class="budgetmaster-blue-light"> + <@header.body> <#import "helpers/navbar.ftl" as navbar> <@navbar.navbar "firstUseGuide" settings/> @@ -112,5 +112,5 @@ <!-- Scripts--> <#import "helpers/scripts.ftl" as scripts> <@scripts.scripts/> - </body> + </@header.body> </html> diff --git a/src/main/resources/templates/helpers/header.ftl b/src/main/resources/templates/helpers/header.ftl index e39ad9c10..dfc2c0dce 100644 --- a/src/main/resources/templates/helpers/header.ftl +++ b/src/main/resources/templates/helpers/header.ftl @@ -55,4 +55,10 @@ <a href="<@s.url cancelUrlBase + "/" + itemId?c + "/delete" />" class="modal-action modal-close waves-effect waves-light green btn-flat white-text">${confirmButtonText}</a> </div> </div> +</#macro> + +<#macro body> + <body class="background-blue-light" <#if settings.isUseDarkTheme()>data-theme="dark"</#if>> + <#nested> + </body> </#macro> \ No newline at end of file diff --git a/src/main/resources/templates/hotkeys.ftl b/src/main/resources/templates/hotkeys.ftl index da5300d29..66bf58716 100644 --- a/src/main/resources/templates/hotkeys.ftl +++ b/src/main/resources/templates/hotkeys.ftl @@ -5,7 +5,7 @@ <@header.header "BudgetMaster - ${locale.getString('menu.hotkeys')}"/> <@header.style "hotkeys"/> </head> - <body class="budgetmaster-blue-light"> + <@header.body> <#import "helpers/navbar.ftl" as navbar> <@navbar.navbar "hotkeys" settings/> @@ -46,7 +46,7 @@ <!-- Scripts--> <#import "helpers/scripts.ftl" as scripts> <@scripts.scripts/> - </body> + </@header.body> </html> <#macro cellKey key> diff --git a/src/main/resources/templates/index.ftl b/src/main/resources/templates/index.ftl index 049132c78..cdaa57927 100644 --- a/src/main/resources/templates/index.ftl +++ b/src/main/resources/templates/index.ftl @@ -5,7 +5,7 @@ <@header.header "BudgetMaster"/> <#import "/spring.ftl" as s> </head> - <body class="background-blue-light"> + <@header.body> <#import "helpers/navbar.ftl" as navbar> <@navbar.navbar "home" settings/> @@ -66,5 +66,5 @@ <!-- Scripts--> <#import "helpers/scripts.ftl" as scripts> <@scripts.scripts/> - </body> + </@header.body> </html> \ No newline at end of file diff --git a/src/main/resources/templates/login.ftl b/src/main/resources/templates/login.ftl index e5b9699a4..f5c06b087 100644 --- a/src/main/resources/templates/login.ftl +++ b/src/main/resources/templates/login.ftl @@ -6,7 +6,7 @@ <@header.style "login"/> <#import "/spring.ftl" as s> </head> - <body class="budgetmaster-blue-light"> + <@header.body> <main> <div class="row valign-wrapper full-height"> <div class="col l4 offset-l4 m6 offset-m3 s10 offset-s1"> @@ -70,5 +70,5 @@ <#import "helpers/scripts.ftl" as scripts> <@scripts.scripts/> <script>document.cookie = "currentDate=${dateService.getDateStringNormal(currentDate)}";</script> - </body> + </@header.body> </html> \ No newline at end of file diff --git a/src/main/resources/templates/placeholder/comingSoon.ftl b/src/main/resources/templates/placeholder/comingSoon.ftl index eae20098d..21a0ebbfc 100644 --- a/src/main/resources/templates/placeholder/comingSoon.ftl +++ b/src/main/resources/templates/placeholder/comingSoon.ftl @@ -4,7 +4,7 @@ <@header.globals/> <@header.header "BudgetMaster"/> </head> - <body class="budgetmaster-blue-light"> + <@header.body> <#import "../helpers/navbar.ftl" as navbar> <@navbar.navbar active settings/> @@ -21,5 +21,5 @@ <!-- Scripts--> <#import "../helpers/scripts.ftl" as scripts> <@scripts.scripts/> - </body> + </@header.body> </html> \ No newline at end of file diff --git a/src/main/resources/templates/placeholder/emptyPage.ftl b/src/main/resources/templates/placeholder/emptyPage.ftl index 2be830518..257b32464 100644 --- a/src/main/resources/templates/placeholder/emptyPage.ftl +++ b/src/main/resources/templates/placeholder/emptyPage.ftl @@ -4,12 +4,12 @@ <@header.globals/> <@header.header "BudgetMaster"/> </head> - <body class="budgetmaster-blue-light"> + <@header.body> <#import "../helpers/navbar.ftl" as navbar> <@navbar.navbar active settings/> <!-- Scripts--> <#import "../helpers/scripts.ftl" as scripts> <@scripts.scripts/> - </body> + </@header.body> </html> \ No newline at end of file diff --git a/src/main/resources/templates/reports/reports.ftl b/src/main/resources/templates/reports/reports.ftl index a75dcf57d..421a75df8 100644 --- a/src/main/resources/templates/reports/reports.ftl +++ b/src/main/resources/templates/reports/reports.ftl @@ -8,7 +8,7 @@ <@header.style "collapsible"/> <#import "/spring.ftl" as s> </head> - <body class="budgetmaster-blue-light"> + <@header.body> <#import "../helpers/navbar.ftl" as navbar> <@navbar.navbar "reports" settings/> @@ -117,5 +117,5 @@ <script src="<@s.url '/js/globalDatePicker.js'/>"></script> <script src="<@s.url '/js/filter.js'/>"></script> <script>document.cookie = "currentDate=${dateService.getDateStringNormal(currentDate)}";</script> - </body> + </@header.body> </html> \ No newline at end of file diff --git a/src/main/resources/templates/search/search.ftl b/src/main/resources/templates/search/search.ftl index be3867481..0a9cee71d 100644 --- a/src/main/resources/templates/search/search.ftl +++ b/src/main/resources/templates/search/search.ftl @@ -8,7 +8,7 @@ <@header.style "search"/> <#import "/spring.ftl" as s> </head> - <body class="budgetmaster-blue-light"> + <@header.body> <#import "../helpers/navbar.ftl" as navbar> <@navbar.navbar "home" settings/> @@ -83,5 +83,5 @@ <#import "../helpers/scripts.ftl" as scripts> <@scripts.scripts/> <script src="<@s.url '/js/search.js'/>"></script> - </body> + </@header.body> </html> \ No newline at end of file diff --git a/src/main/resources/templates/settings/import.ftl b/src/main/resources/templates/settings/import.ftl index 0d6b872c3..7f7b33333 100644 --- a/src/main/resources/templates/settings/import.ftl +++ b/src/main/resources/templates/settings/import.ftl @@ -5,7 +5,7 @@ <@header.header "BudgetMaster - ${locale.getString('settings.database.import')}"/> <#import "/spring.ftl" as s> </head> - <body class="budgetmaster-blue-light"> + <@header.body> <#import "../helpers/navbar.ftl" as navbar> <@navbar.navbar "settings" settings/> @@ -76,5 +76,5 @@ <#import "../helpers/scripts.ftl" as scripts> <@scripts.scripts/> <script src="<@s.url '/js/import.js'/>"></script> - </body> + </@header.body> </html> \ No newline at end of file diff --git a/src/main/resources/templates/settings/settings.ftl b/src/main/resources/templates/settings/settings.ftl index 764cb1ed5..baeb14943 100644 --- a/src/main/resources/templates/settings/settings.ftl +++ b/src/main/resources/templates/settings/settings.ftl @@ -6,7 +6,7 @@ <@header.style "settings"/> <#import "/spring.ftl" as s> </head> - <body class="budgetmaster-blue-light"> + <@header.body> <#import "../helpers/navbar.ftl" as navbar> <@navbar.navbar "settings" settings/> @@ -224,5 +224,5 @@ <script src="<@s.url '/js/libs/spectrum.js'/>"></script> <script src="<@s.url '/js/helpers.js'/>"></script> <script src="<@s.url '/js/settings.js'/>"></script> - </body> + </@header.body> </html> diff --git a/src/main/resources/templates/templates/newTemplate.ftl b/src/main/resources/templates/templates/newTemplate.ftl index 319a80230..93cd13817 100644 --- a/src/main/resources/templates/templates/newTemplate.ftl +++ b/src/main/resources/templates/templates/newTemplate.ftl @@ -15,7 +15,7 @@ <@header.style "collapsible"/> <#import "/spring.ftl" as s> </head> - <body class="budgetmaster-blue-light"> + <@header.body> <#import "../helpers/navbar.ftl" as navbar> <@navbar.navbar "templates" settings/> @@ -94,5 +94,5 @@ <script src="<@s.url '/js/transactions.js'/>"></script> <script src="<@s.url '/js/categorySelect.js'/>"></script> <script src="<@s.url '/js/templates.js'/>"></script> - </body> + </@header.body> </html> diff --git a/src/main/resources/templates/templates/templates.ftl b/src/main/resources/templates/templates/templates.ftl index 1e07873af..eadd163bc 100644 --- a/src/main/resources/templates/templates/templates.ftl +++ b/src/main/resources/templates/templates/templates.ftl @@ -7,7 +7,7 @@ <@header.style "templates"/> <#import "/spring.ftl" as s> </head> - <body class="budgetmaster-blue-light"> + <@header.body> <#import "../helpers/navbar.ftl" as navbar> <@navbar.navbar "templates" settings/> @@ -50,5 +50,5 @@ <#import "../helpers/scripts.ftl" as scripts> <@scripts.scripts/> <script src="<@s.url '/js/templates.js'/>"></script> - </body> + </@header.body> </html> \ No newline at end of file diff --git a/src/main/resources/templates/transactions/newTransactionNormal.ftl b/src/main/resources/templates/transactions/newTransactionNormal.ftl index 9de5fcfaf..ec20214d1 100644 --- a/src/main/resources/templates/transactions/newTransactionNormal.ftl +++ b/src/main/resources/templates/transactions/newTransactionNormal.ftl @@ -16,7 +16,7 @@ <@header.style "collapsible"/> <#import "/spring.ftl" as s> </head> - <body class="budgetmaster-blue-light"> + <@header.body> <#import "../helpers/navbar.ftl" as navbar> <@navbar.navbar "transactions" settings/> @@ -98,5 +98,5 @@ <script src="<@s.url '/js/transactionActions.js'/>"></script> <script src="<@s.url '/js/categorySelect.js'/>"></script> <script src="<@s.url '/js/templates.js'/>"></script> - </body> + </@header.body> </html> diff --git a/src/main/resources/templates/transactions/newTransactionRepeating.ftl b/src/main/resources/templates/transactions/newTransactionRepeating.ftl index 2ccd84503..27456d2cb 100644 --- a/src/main/resources/templates/transactions/newTransactionRepeating.ftl +++ b/src/main/resources/templates/transactions/newTransactionRepeating.ftl @@ -15,7 +15,7 @@ <@header.style "categories"/> <#import "/spring.ftl" as s> </head> - <body class="budgetmaster-blue-light"> + <@header.body> <#import "../helpers/navbar.ftl" as navbar> <@navbar.navbar "transactions" settings/> @@ -89,5 +89,5 @@ <script src="<@s.url '/js/transactions.js'/>"></script> <script src="<@s.url '/js/transactionActions.js'/>"></script> <script src="<@s.url '/js/categorySelect.js'/>"></script> - </body> + </@header.body> </html> diff --git a/src/main/resources/templates/transactions/newTransactionTransfer.ftl b/src/main/resources/templates/transactions/newTransactionTransfer.ftl index 98590a583..05e5ad9f5 100644 --- a/src/main/resources/templates/transactions/newTransactionTransfer.ftl +++ b/src/main/resources/templates/transactions/newTransactionTransfer.ftl @@ -16,7 +16,7 @@ <@header.style "collapsible"/> <#import "/spring.ftl" as s> </head> - <body class="budgetmaster-blue-light"> + <@header.body> <#import "../helpers/navbar.ftl" as navbar> <@navbar.navbar "transactions" settings/> @@ -103,5 +103,5 @@ <script src="<@s.url '/js/transactionActions.js'/>"></script> <script src="<@s.url '/js/categorySelect.js'/>"></script> <script src="<@s.url '/js/templates.js'/>"></script> - </body> + </@header.body> </html> diff --git a/src/main/resources/templates/transactions/transactions.ftl b/src/main/resources/templates/transactions/transactions.ftl index 92ddb4087..be712f449 100644 --- a/src/main/resources/templates/transactions/transactions.ftl +++ b/src/main/resources/templates/transactions/transactions.ftl @@ -9,7 +9,7 @@ <@header.style "collapsible"/> <#import "/spring.ftl" as s> </head> - <body class="budgetmaster-blue-light"> + <@header.body> <#import "../helpers/navbar.ftl" as navbar> <@navbar.navbar "transactions" settings/> @@ -108,5 +108,5 @@ <script src="<@s.url '/js/globalDatePicker.js'/>"></script> <script src="<@s.url '/js/filter.js'/>"></script> <script>document.cookie = "currentDate=${dateService.getDateStringNormal(currentDate)}";</script> - </body> + </@header.body> </html> -- GitLab