#298 - moved cdn references to macros; added title to header macro

9620a0f5 · Robert Goldmann · a12188a2 · 9620a0f5 · 9620a0f5 · 9620a0f5
Commit 9620a0f5 authored 7 years ago by Robert Goldmann
--- a/src/main/resources/templates/about.ftl
+++ b/src/main/resources/templates/about.ftl
 <html>
    <head>
        <#import "header.ftl" as header>
-        <@header.header/>
+        <@header.header "BudgetMaster"/>
        <#assign locale = static["tools.Localization"]>
    </head>
    <body class="budgetmaster-blue-light">
@@ -46,8 +46,7 @@
        </main>

        <!--  Scripts-->
-        <script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/js/materialize.min.js"></script>
-        <script src="/js/main.js"></script>
+        <#import "scripts.ftl" as scripts>
+        <@scripts.scripts/>
    </body>
 </html>
\ No newline at end of file
--- a/src/main/resources/templates/accounts/accounts.ftl
+++ b/src/main/resources/templates/accounts/accounts.ftl
 <html>
    <head>
        <#import "../header.ftl" as header>
-        <@header.header/>
+        <@header.header "BudgetMaster"/>
        <#assign locale = static["tools.Localization"]>
    </head>
    <body class="budgetmaster-blue-light">
@@ -49,9 +49,8 @@
        </main>

        <!--  Scripts-->
-        <script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/js/materialize.min.js"></script>
-        <script src="/js/main.js"></script>
+        <#import "../scripts.ftl" as scripts>
+        <@scripts.scripts/>
        <script src="/js/categories.js"></script>
    </body>
 </html>
\ No newline at end of file
--- a/src/main/resources/templates/accounts/newAccount.ftl
+++ b/src/main/resources/templates/accounts/newAccount.ftl
 <html>
    <head>
        <#import "../header.ftl" as header>
-        <@header.header/>
+        <@header.header "BudgetMaster"/>
        <#assign locale = static["tools.Localization"]>
    </head>
    <body class="budgetmaster-blue-light">
@@ -61,8 +61,7 @@
        </main>

        <!-- Scripts-->
-        <script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/js/materialize.min.js"></script>
-        <script src="/js/main.js"></script>
+        <#import "../scripts.ftl" as scripts>
+        <@scripts.scripts/>
    </body>
 </html>
\ No newline at end of file
--- a/src/main/resources/templates/categories/categories.ftl
+++ b/src/main/resources/templates/categories/categories.ftl
 <html>
    <head>
        <#import "../header.ftl" as header>
-        <@header.header/>
+        <@header.header "BudgetMaster"/>
        <link type="text/css" rel="stylesheet" href="/css/categories.css"/>
        <#assign locale = static["tools.Localization"]>
    </head>
@@ -59,9 +59,8 @@
        </main>

        <!--  Scripts-->
-        <script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/js/materialize.min.js"></script>
-        <script src="/js/main.js"></script>
+        <#import "../scripts.ftl" as scripts>
+        <@scripts.scripts/>
        <script src="/js/categories.js"></script>
    </body>
 </html>
\ No newline at end of file
--- a/src/main/resources/templates/categories/newCategory.ftl
+++ b/src/main/resources/templates/categories/newCategory.ftl
 <html>
    <head>
        <#import "../header.ftl" as header>
-        <@header.header/>
+        <@header.header "BudgetMaster"/>
        <link type="text/css" rel="stylesheet" href="/css/spectrum.css"/>
        <link type="text/css" rel="stylesheet" href="/css/categories.css"/>
        <#assign locale = static["tools.Localization"]>
@@ -89,9 +89,8 @@
        </main>

        <!-- Scripts-->
-        <script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/js/materialize.min.js"></script>
-        <script src="/js/main.js"></script>
+        <#import "../scripts.ftl" as scripts>
+        <@scripts.scripts/>
        <script src="/js/spectrum.js"></script>
        <script src="/js/categories.js"></script>
    </body>

--- a/src/main/resources/templates/emptyPage.ftl
+++ b/src/main/resources/templates/emptyPage.ftl
 <html>
    <head>
        <#import "header.ftl" as header>
-        <@header.header/>
+        <@header.header "BudgetMaster"/>
        <#assign locale = static["tools.Localization"]>
    </head>
    <body class="budgetmaster-blue-light">
        <#import "navbar.ftl" as navbar>
        <@navbar.navbar active/>

-
-
        <!--  Scripts-->
-        <script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/js/materialize.min.js"></script>
-        <script src="/js/main.js"></script>
+         <#import "scripts.ftl" as scripts>
+        <@scripts.scripts/>
    </body>
 </html>
\ No newline at end of file
--- a/src/main/resources/templates/error/403.ftl
+++ b/src/main/resources/templates/error/403.ftl
 <html>
    <head>
-        <title>BudgetMaster - 403</title>
-        <meta charset="UTF-8"/>
-        <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
-        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/css/materialize.css">
-        <link type="text/css" rel="stylesheet" href="/css/style.css"/>
+            <#import "../header.ftl" as header>
+            <@header.header "BudgetMaster - 403"/>
            <link type="text/css" rel="stylesheet" href="/css/login.css"/>
-
-        <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
            <#assign locale = static["tools.Localization"]>
    </head>
    <body class="budgetmaster-blue-light">

--- a/src/main/resources/templates/error/404.ftl
+++ b/src/main/resources/templates/error/404.ftl
 <html>
    <head>
-        <title>BudgetMaster - 404</title>
-        <meta charset="UTF-8"/>
-        <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
-        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/css/materialize.css">
-        <link type="text/css" rel="stylesheet" href="/css/style.css"/>
+        <#import "../header.ftl" as header>
+        <@header.header "BudgetMaster - 404"/>
        <link type="text/css" rel="stylesheet" href="/css/login.css"/>
-
-        <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
        <#assign locale = static["tools.Localization"]>
    </head>
    <body class="budgetmaster-blue-light">

--- a/src/main/resources/templates/error/418.ftl
+++ b/src/main/resources/templates/error/418.ftl
 <html>
    <head>
-        <title>BudgetMaster - 418</title>
-        <meta charset="UTF-8"/>
-        <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
-        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/css/materialize.css">
-        <link type="text/css" rel="stylesheet" href="/css/style.css"/>
+        <#import "../header.ftl" as header>
+        <@header.header "BudgetMaster - 418">
        <link type="text/css" rel="stylesheet" href="/css/login.css"/>
-
-        <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
        <#assign locale = static["tools.Localization"]>
    </head>
    <body class="budgetmaster-blue-light">
@@ -37,8 +32,7 @@
        </main>

        <!--  Scripts-->
-    <script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/js/materialize.min.js"></script>
-    <script src="/js/main.js"></script>
+        <#import "../scripts.ftl" as scripts>
+        <@scripts.scripts/>
    </body>
 </html>
\ No newline at end of file
--- a/src/main/resources/templates/error/500.ftl
+++ b/src/main/resources/templates/error/500.ftl
 <html>
    <head>
-        <title>BudgetMaster - 500</title>
-        <meta charset="UTF-8"/>
-        <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
-        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/css/materialize.css">
-        <link type="text/css" rel="stylesheet" href="/css/style.css"/>
+        <#import "../header.ftl" as header>
+        <@header.header "BudgetMaster - 500"/>
        <link type="text/css" rel="stylesheet" href="/css/login.css"/>
-
-        <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
        <#assign locale = static["tools.Localization"]>
    </head>
    <body class="budgetmaster-blue-light">
@@ -35,8 +30,7 @@
        </main>

        <!--  Scripts-->
-    <script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/js/materialize.min.js"></script>
-    <script src="/js/main.js"></script>
+        <#import "../scripts.ftl" as scripts>
+        <@scripts.scripts/>
    </body>
 </html>
\ No newline at end of file
--- a/src/main/resources/templates/header.ftl
+++ b/src/main/resources/templates/header.ftl
-<#macro header>
-        <title>BudgetMaster</title>
+<#macro header title>
+        <title>${title}</title>
        <meta charset="UTF-8"/>
        <link href="https://fonts.googleapis.com/icon?family=Material+Icons" rel="stylesheet">
        <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/css/materialize.css">

--- a/src/main/resources/templates/index.ftl
+++ b/src/main/resources/templates/index.ftl
 <html>
    <head>
        <#import "header.ftl" as header>
-        <@header.header/>
+        <@header.header "BudgetMaster"/>
    </head>
    <body class="budgetmaster-blue-light">
        <#import "navbar.ftl" as navbar>
@@ -55,9 +55,8 @@
        </main>

        <!--  Scripts-->
-        <script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/js/materialize.min.js"></script>
-        <script src="/js/main.js"></script>
+        <#import "scripts.ftl" as scripts>
+        <@scripts.scripts/>
        <script src="/js/datePicker.js"></script>
    </body>
 </html>
\ No newline at end of file
--- a/src/main/resources/templates/login.ftl
+++ b/src/main/resources/templates/login.ftl
 <html>
    <head>
        <#import "header.ftl" as header>
-        <@header.header/>
+        <@header.header "BudgetMaster"/>
        <link type="text/css" rel="stylesheet" href="/css/login.css"/>

        <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
@@ -31,8 +31,7 @@
        </main>

        <!--  Scripts-->
-    <script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/js/materialize.min.js"></script>
-    <script src="/js/main.js"></script>
+        <#import "scripts.ftl" as scripts>
+        <@scripts.scripts/>
    </body>
 </html>
\ No newline at end of file
--- a/src/main/resources/templates/payments/newPayment.ftl
+++ b/src/main/resources/templates/payments/newPayment.ftl
 <html>
    <head>
        <#import "../header.ftl" as header>
-        <@header.header/>
+        <@header.header "BudgetMaster"/>
        <#assign locale = static["tools.Localization"]>
    </head>
    <body class="budgetmaster-blue-light">
@@ -177,9 +177,8 @@
        </script>

        <!-- Scripts-->
-        <script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/js/materialize.min.js"></script>
-        <script src="/js/main.js"></script>
+        <#import "../scripts.ftl" as scripts>
+        <@scripts.scripts/>
        <script src="/js/spectrum.js"></script>
        <script src="/js/payments.js"></script>
    </body>

--- a/src/main/resources/templates/payments/payments.ftl
+++ b/src/main/resources/templates/payments/payments.ftl
 <html>
    <head>
        <#import "../header.ftl" as header>
-        <@header.header/>
+        <@header.header "BudgetMaster"/>
        <link type="text/css" rel="stylesheet" href="/css/categories.css"/>
        <#assign locale = static["tools.Localization"]>
    </head>
@@ -72,9 +72,8 @@
        </main>

        <!--  Scripts-->
-        <script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
-        <script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/js/materialize.min.js"></script>
-        <script src="/js/main.js"></script>
+        <#import "../scripts.ftl" as scripts>
+        <@scripts.scripts/>
        <script src="/js/payments.js"></script>
        <script src="/js/datePicker.js"></script>
        <script>document.cookie = "currentDate=${helpers.getDateString(currentDate)}";</script>

--- a/src/main/resources/templates/scripts.ftl
+++ b/src/main/resources/templates/scripts.ftl
+<#macro scripts>
+<script src="https://code.jquery.com/jquery-2.1.1.min.js"></script>
+<script src="https://cdnjs.cloudflare.com/ajax/libs/materialize/0.100.2/js/materialize.min.js"></script>
+<script src="/js/main.js"></script>
+</#macro>
\ No newline at end of file