Skip to content
Snippets Groups Projects
Commit 88214d29 authored by Robert Goldmann's avatar Robert Goldmann
Browse files

#569 - externalized globals to own macro

parent c6febe47
No related branches found
No related tags found
No related merge requests found
Showing
with 44 additions and 22 deletions
<html> <html>
<head> <head>
<#import "helpers/header.ftl" as header> <#import "helpers/header.ftl" as header>
<@header.globals/>
<@header.header "BudgetMaster"/> <@header.header "BudgetMaster"/>
</head> </head>
<body class="budgetmaster-blue-light"> <body class="budgetmaster-blue-light">
......
<html> <html>
<head> <head>
<#import "../helpers/header.ftl" as header> <#import "../helpers/header.ftl" as header>
<@header.globals/>
<@header.header "BudgetMaster"/> <@header.header "BudgetMaster"/>
<#import "/spring.ftl" as s> <#import "/spring.ftl" as s>
</head> </head>
......
<html> <html>
<head> <head>
<#import "../helpers/header.ftl" as header> <#import "../helpers/header.ftl" as header>
<@header.globals/>
<@header.header "BudgetMaster"/> <@header.header "BudgetMaster"/>
<#import "/spring.ftl" as s> <#import "/spring.ftl" as s>
</head> </head>
......
<html> <html>
<head> <head>
<#import "../helpers/header.ftl" as header> <#import "../helpers/header.ftl" as header>
<@header.globals/>
<@header.header "BudgetMaster"/> <@header.header "BudgetMaster"/>
<@header.style "categories"/> <@header.style "categories"/>
<#import "/spring.ftl" as s> <#import "/spring.ftl" as s>
......
...@@ -3,6 +3,7 @@ ...@@ -3,6 +3,7 @@
<#import "/spring.ftl" as s> <#import "/spring.ftl" as s>
<#import "../helpers/header.ftl" as header> <#import "../helpers/header.ftl" as header>
<@header.globals/>
<@header.header "BudgetMaster"/> <@header.header "BudgetMaster"/>
<link type="text/css" rel="stylesheet" href="<@s.url '${"/css/libs/spectrum.css"}'/>"/> <link type="text/css" rel="stylesheet" href="<@s.url '${"/css/libs/spectrum.css"}'/>"/>
<@header.style "categories"/> <@header.style "categories"/>
......
<html> <html>
<head> <head>
<#import "../helpers/header.ftl" as header> <#import "../helpers/header.ftl" as header>
<@header.globals/>
<@header.header "BudgetMaster"/> <@header.header "BudgetMaster"/>
<@header.style "datepicker"/> <@header.style "datepicker"/>
<@header.style "collapsible"/> <@header.style "collapsible"/>
......
<html> <html>
<head> <head>
<#import "../helpers/header.ftl" as header> <#import "../helpers/header.ftl" as header>
<@header.globals/>
<@header.header "BudgetMaster"/> <@header.header "BudgetMaster"/>
<#import "/spring.ftl" as s> <#import "/spring.ftl" as s>
</head> </head>
......
<html> <html>
<head> <head>
<#import "../helpers/header.ftl" as header> <#import "../helpers/header.ftl" as header>
<@header.globals/>
<@header.header "BudgetMaster"/> <@header.header "BudgetMaster"/>
<#import "/spring.ftl" as s> <#import "/spring.ftl" as s>
<link rel="stylesheet" href="<@s.url "/webjars/codemirror/5.50.0/lib/codemirror.css"/>"> <link rel="stylesheet" href="<@s.url "/webjars/codemirror/5.50.0/lib/codemirror.css"/>">
......
<html> <html>
<head> <head>
<#import "../helpers/header.ftl" as header> <#import "../helpers/header.ftl" as header>
<@header.globals/>
<@header.header "BudgetMaster - 400"/> <@header.header "BudgetMaster - 400"/>
<@header.style "login"/> <@header.style "login"/>
<#import "/spring.ftl" as s> <#import "/spring.ftl" as s>
......
<html> <html>
<head> <head>
<#import "../helpers/header.ftl" as header> <#import "../helpers/header.ftl" as header>
<@header.globals/>
<@header.header "BudgetMaster - 403"/> <@header.header "BudgetMaster - 403"/>
<@header.style "login"/> <@header.style "login"/>
<#import "/spring.ftl" as s> <#import "/spring.ftl" as s>
......
<html> <html>
<head> <head>
<#import "../helpers/header.ftl" as header> <#import "../helpers/header.ftl" as header>
<@header.globals/>
<@header.header "BudgetMaster - 404"/> <@header.header "BudgetMaster - 404"/>
<@header.style "login"/> <@header.style "login"/>
<#import "/spring.ftl" as s> <#import "/spring.ftl" as s>
......
<html> <html>
<head> <head>
<#import "../helpers/header.ftl" as header> <#import "../helpers/header.ftl" as header>
<@header.globals/>
<@header.header "BudgetMaster - 418"/> <@header.header "BudgetMaster - 418"/>
<@header.style "login"/> <@header.style "login"/>
<#import "/spring.ftl" as s> <#import "/spring.ftl" as s>
......
<html> <html>
<head> <head>
<#import "../helpers/header.ftl" as header> <#import "../helpers/header.ftl" as header>
<@header.globals/>
<@header.header "BudgetMaster - 500"/> <@header.header "BudgetMaster - 500"/>
<@header.style "login"/> <@header.style "login"/>
<#import "/spring.ftl" as s> <#import "/spring.ftl" as s>
......
<html> <html>
<head> <head>
<#import "helpers/header.ftl" as header> <#import "helpers/header.ftl" as header>
<@header.globals/>
<@header.header "BudgetMaster"/> <@header.header "BudgetMaster"/>
<#import "/spring.ftl" as s> <#import "/spring.ftl" as s>
</head> </head>
......
...@@ -7,15 +7,7 @@ ...@@ -7,15 +7,7 @@
</#if> </#if>
</#macro> </#macro>
<#macro header title> <#macro globals>
<#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"/>
<#global locale = static["de.thecodelabs.utils.util.Localization"]> <#global locale = static["de.thecodelabs.utils.util.Localization"]>
<#global programArgs = static["de.deadlocker8.budgetmaster.ProgramArgs"]> <#global programArgs = static["de.deadlocker8.budgetmaster.ProgramArgs"]>
...@@ -28,6 +20,17 @@ ...@@ -28,6 +20,17 @@
</#if> </#if>
</#macro> </#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> <#macro logo id classes>
<#import "/spring.ftl" as s> <#import "/spring.ftl" as s>
<#if helpers.getSettings().isUseDarkTheme()> <#if helpers.getSettings().isUseDarkTheme()>
......
<html> <html>
<head> <head>
<#import "helpers/header.ftl" as header> <#import "helpers/header.ftl" as header>
<@header.globals/>
<@header.header "BudgetMaster"/> <@header.header "BudgetMaster"/>
<@header.style "hotkeys"/> <@header.style "hotkeys"/>
</head> </head>
......
<html> <html>
<head> <head>
<#import "helpers/header.ftl" as header> <#import "helpers/header.ftl" as header>
<@header.globals/>
<@header.header "BudgetMaster"/> <@header.header "BudgetMaster"/>
<#import "/spring.ftl" as s> <#import "/spring.ftl" as s>
</head> </head>
......
<html> <html>
<head> <head>
<#import "helpers/header.ftl" as header> <#import "helpers/header.ftl" as header>
<@header.globals/>
<@header.header "BudgetMaster"/> <@header.header "BudgetMaster"/>
<@header.style "login"/> <@header.style "login"/>
<#import "/spring.ftl" as s> <#import "/spring.ftl" as s>
......
<html> <html>
<head> <head>
<#import "../helpers/header.ftl" as header> <#import "../helpers/header.ftl" as header>
<@header.globals/>
<@header.header "BudgetMaster"/> <@header.header "BudgetMaster"/>
</head> </head>
<body class="budgetmaster-blue-light"> <body class="budgetmaster-blue-light">
......
<html> <html>
<head> <head>
<#import "../helpers/header.ftl" as header> <#import "../helpers/header.ftl" as header>
<@header.globals/>
<@header.header "BudgetMaster"/> <@header.header "BudgetMaster"/>
</head> </head>
<body class="budgetmaster-blue-light"> <body class="budgetmaster-blue-light">
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment