From 0015600dc4465bf61e31eea237b4c7f43614f6dc Mon Sep 17 00:00:00 2001
From: Gabriel Copat <copatg@cardiff.ac.uk>
Date: Thu, 14 Dec 2023 10:57:16 +0000
Subject: [PATCH] HTML fixes w/ Rhys Nute
---
.../resources/templates/business-data.html | 64 ++++++++++---------
src/main/resources/templates/businesses.html | 31 +++++----
.../resources/templates/local-auth-data.html | 4 +-
.../templates/local-authorities.html | 6 +-
4 files changed, 58 insertions(+), 47 deletions(-)
diff --git a/src/main/resources/templates/business-data.html b/src/main/resources/templates/business-data.html
index 89923b70..4f40219a 100644
--- a/src/main/resources/templates/business-data.html
+++ b/src/main/resources/templates/business-data.html
@@ -6,36 +6,40 @@
<link rel="stylesheet" th:href="@{css/landmarkFormStyle.css}">
<link rel="stylesheet" th:href="@{css/mobile-style.css}">
</head>
-<header th:insert="fragments/banners :: header"></header>
+
<body>
-<div id="container1">
- <h2>Enter your Business information</h2>
- <form action="/businesses" id="data" name="data" method="post" th:object="${business}">
- <br>
- <label>Enter your business
- <input type="text" th:field="*{businessName}">
- </label><br><br>
- <label>Please enter first line of your address
- <input type="text" th:field="*{address1}">
- </label><br><br>
- <label>Please enter second line of your address (optional)
- <input type="text" th:field="*{address2}">
- </label><br><br>
- <label>Please enter the City/Town
- <input type="text" th:field="*{city}">
- </label><br><br>
- <label>Please enter you county (optional)
- <input type="text" th:field="*{county}">
- </label><br><br>
- <label>Please enter your postcode
- <input type="text" th:field="*{postcode}">
- </label><br><br>
- <label>Please enter your website address
- <input type="text" th:field="*{website}">
- </label><br><br>
- <input type="submit">
- </form>
-</div>
+ <header th:replace="~{/fragments/banners::header}"></header>
+ <main>
+ <div id="container1">
+ <h2>Enter your Business information</h2>
+ <form action="/businesses" id="data" name="data" method="post" th:object="${business}">
+ <br>
+ <label>Enter your business
+ <input type="text" th:field="*{businessName}">
+ </label><br><br>
+ <label>Please enter first line of your address
+ <input type="text" th:field="*{address1}">
+ </label><br><br>
+ <label>Please enter second line of your address (optional)
+ <input type="text" th:field="*{address2}">
+ </label><br><br>
+ <label>Please enter the City/Town
+ <input type="text" th:field="*{city}">
+ </label><br><br>
+ <label>Please enter you county (optional)
+ <input type="text" th:field="*{county}">
+ </label><br><br>
+ <label>Please enter your postcode
+ <input type="text" th:field="*{postcode}">
+ </label><br><br>
+ <label>Please enter your website address
+ <input type="text" th:field="*{website}">
+ </label><br><br>
+ <input type="submit">
+ </form>
+ </div>
+ </main>
+
+ <div th:replace="~{fragments/banners :: footer}"></div>
</body>
-<div th:insert="fragments/banners :: footer"></div>
</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/businesses.html b/src/main/resources/templates/businesses.html
index 29dca724..7a907227 100644
--- a/src/main/resources/templates/businesses.html
+++ b/src/main/resources/templates/businesses.html
@@ -1,23 +1,28 @@
<!DOCTYPE html>
-<html lang="en">
-<html xmlns:th="http://www.thymeleaf.org">
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
<head>
<meta charset="UTF-8">
<title>Businesses</title>
<link rel="stylesheet" th:href="@{css/landmarkFormStyle.css}">
<link rel="stylesheet" th:href="@{css/mobile-style.css}">
</head>
-<header th:insert="fragments/banners :: header"></header>
+
<body>
-<p>A business is an organised establishment in a professional manner in order to achieve your particular aim for owning a business.</p>
-<h3>Future Proof Businesses</h3>
-<h3>Compete with Online Retailers</h3>
-<h3>Drive Footfall to the high street</h3>
-<h3>Increase Sales</h3>
-<ul th:each="businesses:${busiSub}">
- <li th:text="${businesses}"></li>
-</ul>
-<button><a href="/businessSub" id="business">Businesses please enter here</a></button>
+ <header th:replace="~{/fragments/banners::header}"></header>
+
+ <main>
+ <p>A business is an organised establishment in a professional manner in order to achieve your particular aim for owning a business.</p>
+ <h3>Future Proof Businesses</h3>
+ <h3>Compete with Online Retailers</h3>
+ <h3>Drive Footfall to the high street</h3>
+ <h3>Increase Sales</h3>
+ <ul th:each="businesses:${busiSub}">
+ <li th:text="${businesses}"></li>
+ </ul>
+ <button><a href="/businessSub" id="business">Businesses please enter here</a></button>
+ </main>
+
+ <footer th:replace="~{fragments/banners :: footer}"></footer>
</body>
-<div th:insert="fragments/banners :: footer"></div>
+
</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/local-auth-data.html b/src/main/resources/templates/local-auth-data.html
index 57870dfa..1ca493de 100644
--- a/src/main/resources/templates/local-auth-data.html
+++ b/src/main/resources/templates/local-auth-data.html
@@ -7,7 +7,7 @@
<link rel="stylesheet" th:href="@{css/landmarkFormStyle.css}">
<link rel="stylesheet" th:href="@{css/mobile-style.css}">
</head>
-<header th:insert="~{/fragments/banners::header}"></header>
+<header th:replace="~{/fragments/banners::header}"></header>
<body>
<main>
<div id="container1">
@@ -40,5 +40,5 @@
</div>
</main>
</body>
-<footer th:insert="~{/fragments/banners::footer}"></footer>
+<footer th:replace="~{/fragments/banners::footer}"></footer>
</html>
\ No newline at end of file
diff --git a/src/main/resources/templates/local-authorities.html b/src/main/resources/templates/local-authorities.html
index eeda465b..9b58b057 100644
--- a/src/main/resources/templates/local-authorities.html
+++ b/src/main/resources/templates/local-authorities.html
@@ -6,8 +6,9 @@
<link rel="stylesheet" th:href="@{css/localAuthorityPageStyle.css}">
<link rel="stylesheet" th:href="@{css/mobile-style.css}">
</head>
-<header th:insert="fragments/banners :: header"></header>
+
<body>
+ <header th:replace="fragments/banners :: header"></header>
<main>
<h1>Local Authorities</h1>
<div id="councils">
@@ -16,7 +17,8 @@
</ul>
</div>
<button><a href="/localForm" id="authority">Local Authorities please enter here</a></button>
- <div th:insert="fragments/banners :: footer"></div>
+
</main>
+ <footer th:replace="fragments/banners :: footer"></footer>
</body>
</html>
\ No newline at end of file
--
GitLab