From 6ecf6e86aee58cfb94d9eee4b41625955168036c Mon Sep 17 00:00:00 2001
From: Gabriel Copat <copatg@cardiff.ac.uk>
Date: Thu, 14 Dec 2023 10:02:24 +0000
Subject: [PATCH] Bugfixing w/ Rhys Nute
---
.../Organisation/organisationControllers.java | 2 +-
.../WorkWith/local-authorities.html | 14 +++++++-------
.../resources/templates/local-authorities.html | 4 ++--
3 files changed, 10 insertions(+), 10 deletions(-)
rename src/main/resources/{ => templates}/WorkWith/local-authorities.html (50%)
diff --git a/src/main/java/Team5/SmartTowns/Organisation/organisationControllers.java b/src/main/java/Team5/SmartTowns/Organisation/organisationControllers.java
index a5927d4c..638e97a7 100644
--- a/src/main/java/Team5/SmartTowns/Organisation/organisationControllers.java
+++ b/src/main/java/Team5/SmartTowns/Organisation/organisationControllers.java
@@ -19,7 +19,7 @@ import java.util.List;
public class organisationControllers {
@GetMapping("/localauthorities")
public ModelAndView getLocalAuthoritiesPage(){
- ModelAndView modelAndView = new ModelAndView("WorkWith/local-authorities.html");
+ ModelAndView modelAndView = new ModelAndView("local-authorities");
return modelAndView;
}
@GetMapping("/businesses")
diff --git a/src/main/resources/WorkWith/local-authorities.html b/src/main/resources/templates/WorkWith/local-authorities.html
similarity index 50%
rename from src/main/resources/WorkWith/local-authorities.html
rename to src/main/resources/templates/WorkWith/local-authorities.html
index 1ee0ecc9..abeb1a11 100644
--- a/src/main/resources/WorkWith/local-authorities.html
+++ b/src/main/resources/templates/WorkWith/local-authorities.html
@@ -3,19 +3,19 @@
<head>
<meta charset="UTF-8">
<title>Local Authorities</title>
- <link rel="stylesheet" href="../static/css/templatingstyle.css">
+ <link rel="stylesheet" href="../../static/css/templatingstyle.css">
</head>
-<header th:insert="~{/towns/Templating.html::header}"></header>
+<header th:insert="~{/fragments/Templating.html::header}"></header>
<body>
<h1>Local Authorities</h1>
<div id="councils">
<p>Caerphilly County Borough Council,<br>Tredomen Park,<br> Ystrad Mynach,<br> Hengoed,<br> CF82 7PG</p>
<a href="https://www.caerphilly.gov.uk/main.aspx?lang=en-GB">Caerphilly County Borough Council Website</a>
<p>Risca Town Council,<br>Risca Palace Library,<br>Unit B,<br>75 Tredegar Street,<br>Risca,<br>NP11 6BW</p>
- <a href="https://www.riscatowncouncil.org.uk/">Risca Town Council Website</a>
- <p>Penarth Town Council West House,<br>Stanwell Road,<br>Penarth,<br> CF64 2YG</p>
- <a href="https://www.penarthtowncouncil.gov.uk/your-council/">Penarth Town Council Website</a>
-</div>
-<footer th:insert="~{/towns/Templating.html::footer}"></footer>
+ <a href="https://www.riscatowncouncil.org.uk/">Risca Town Council Website</a>
+ <p>Penarth Town Council West House,<br>Stanwell Road,<br>Penarth,<br> CF64 2YG</p>
+ <a href="https://www.penarthtowncouncil.gov.uk/your-council/">Penarth Town Council Website</a>
+ </div>
+ <footer th:insert="~{/fragments/Templating.html::footer}"></footer>
</body>
</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 bdc00cdb..50b5fa8b 100644
--- a/src/main/resources/templates/local-authorities.html
+++ b/src/main/resources/templates/local-authorities.html
@@ -6,7 +6,7 @@
<link rel="stylesheet" th:href="@{css/localAuthorityPageStyle.css}">
<link rel="stylesheet" th:href="@{css/templatingstyle.css}">
</head>
-<header th:insert="~{/towns/Templating.html::header}"></header>
+<header th:insert="~{/fragments/Templating.html::header}"></header>
<body>
<h1>Local Authorities</h1>
<div id="councils">
@@ -15,6 +15,6 @@
</ul>
</div>
<button><a href="/localForm" id="authority">Local Authorities please enter here</a></button>
-<footer th:insert="~{/towns/Templating.html::footer}"></footer>
+<footer th:insert="~{/fragments/Templating.html::footer}"></footer>
</body>
</html>
\ No newline at end of file
--
GitLab