diff --git a/src/main/resources/templates/about.ftl b/src/main/resources/templates/about.ftl index 1d05e0333ea9376633d7db53b4de9e8c94dbe60c..62963f620064861c8fe9221a70cdff25ed0b23ee 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 abfa22914d5c69b7bde5a7222b4eeb44a99503fd..87f6ec596dedd7311975cb99fc871edddda737d6 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 972169b2cdc814d9777e25346a4886167abed5be..41a2273ae2e98227769a095afc7f668b1a26fb5e 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 2ba1fa4408e8b2f7db4954f97517068e582b56a3..fca30c4fc3542e134153d62728a04335d2facf45 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 c4595c2246c96bb2250c50d665a9f891102086b8..4e716bf89525d889eaea71559a6a74c0e3713b93 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 8e9e98a8e7f8e0350587745be8177b3411af1625..c6be3071402bb449d200954d62933a573139ff9c 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 f6c107af19fc1c911beff039e01d2cf745400538..94b6495b0259d98f04dff6f378d4eab08ec1054d 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 4c2e5eb0d278c6b21cd1f7b9d9fa2692222a8bfb..173e2a9905061e94f646ca9a9c85383438d2785b 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 15d3cc46c4b0a2aef7c8db92c83610e8a9a22e4c..b66d11075af8732c40d4e5212f5cf7612cb7bd92 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 6126a37c558e3567e307a4fe672fdd8a46525656..bcf6f85e8cdf0fa1ca1fccdb8714eb7d285e3bff 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 eec84613a0c8f6dd9337b3dc8d035487e143b849..00cca924ba66833459d3483e16fce25cff4f0374 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 35345ff7711cbd5996e2ad0b1e07b069eff37606..39bccd513fbd9e4964f4a348e82607c55eed3517 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 dce60865978927e2a342fb20f12b424945cd6af8..e372398731be3d2099a29f930625625a8980eded 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 0c5638a6c23d82540e3da37b3eab6b6f546a36ad..9f56150a06959c5df4b597f45acab5281740ae53 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 e39ad9c10da60b04bfd1e3123fd60d615741b6e0..dfc2c0dce0c50bd72d153a7c7942a47465f907cc 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 da5300d29918f6da404c9522f6ad21a2fba91a71..66bf587162ecab3ee0225cedd9fb6fb3c221f5be 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 049132c78146ef5ba32ba7ca9c3060d648573ca1..cdaa579277764d3d8e6ee9587f44e82bc7d48f73 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 e5b9699a4f1cd6189bb4945fa448e1334dfa1c82..f5c06b0872abd54c3b83b8685b096f1dfc26c2e0 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 eae20098d5e0c3a4288bc095f6db0ef81d6f792a..21a0ebbfc5efe853e958dca818ae8d661d2771bf 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 2be830518635c7b447c59ffed591110d1dcb7e77..257b324649052004d9213ade0139de975aee03af 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 a75dcf57daafc88005ddc587031e969c6d1a81c7..421a75df832bf1baaed47c7999151c285bbdca7e 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 be386748123b9ab85c7bc7dbdf5dd1e7f123d894..0a9cee71d98e9155ac876b90e522fff9cf2fa0ab 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 0d6b872c35b845b360e3de6488f67342ef824843..7f7b333331f0c241a064cf825115f3f27cbe2682 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 764cb1ed504aa21a92de42a054107ec62517c985..baeb149434b49752accb3c56feb34e3f26078655 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 319a80230db520c9533397e390411c2023e088e9..93cd13817c57584385bef505f34d8d550e90a915 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 1e07873aff3dfff0dd13faf3d209196ccbf32e2e..eadd163bca37de269cdd0aecd923aadf84549b17 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 9de5fcfafaf1dd538820198bb991c5822fcdb563..ec20214d1fb9578585151d7d1e87de8e158e2611 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 2ccd845034a4c5def4ee99720e3adb9ced84eca8..27456d2cbeb25c717a1e90e0d3ed50bebf6543c8 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 98590a583be40ce6f6b4d4bb996d54899d440920..05e5ad9f5b966df3e05b577c253022dcfcbb9c7f 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 92ddb4087c31fc5816b4a96fb850b292f037d50e..be712f44964a35692dd2a85b0d37763a82237602 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>