diff --git a/src/main/java/Team5/SmartTowns/placeswithcoordinates/PlacesController.java b/src/main/java/Team5/SmartTowns/placeswithcoordinates/PlacesController.java
index 9c8c1ed57e8a0a2e24891504ab3deef9f36c0cd1..12e4e066c8e5e683e269e7d15213f3c710959577 100644
--- a/src/main/java/Team5/SmartTowns/placeswithcoordinates/PlacesController.java
+++ b/src/main/java/Team5/SmartTowns/placeswithcoordinates/PlacesController.java
@@ -60,13 +60,13 @@ public class PlacesController {
int townIDFromTable= placeRepo.getTownIDFromName(townNamee);
for (int i=0;i<trailslocations.size();i++){
int trailID = trailsRepo.getTrailIDFromTrailName(trailslocations.get(i).getTrailName());
- if ((trailID>100)&&(trailID<200)){
+ if ((trailID>100)&&(trailID<200)&&(Objects.equals(townNamee, "Caerphilly"))){
correctTrails.add(trailslocations.get(i));
}
- if ((trailID>200)&&(trailID<300)){
+ if ((trailID>200)&&(trailID<300)&&(Objects.equals(townNamee, "Risca"))){
correctTrails.add(trailslocations.get(i));
}
- if ((trailID>300)&&(trailID<400)){
+ if ((trailID>300)&&(trailID<400)&& (Objects.equals(townNamee, "Penarth")) ){
correctTrails.add(trailslocations.get(i));
}
}
diff --git a/src/main/resources/templates/fragments/townsPageFrags.html b/src/main/resources/templates/fragments/townsPageFrags.html
index d9f892be209d344317862a41428ee68d0282c527..435fecf3cebb3af2789150ff915ab5351a193309 100644
--- a/src/main/resources/templates/fragments/townsPageFrags.html
+++ b/src/main/resources/templates/fragments/townsPageFrags.html
@@ -4,13 +4,69 @@
<meta charset="UTF-8">
<title th:text="${town.getTownName()}"></title>
<link rel="stylesheet" th:href="@{/css/templatingstyle.css}">
- <link rel="stylesheet" th:href="@{/css/locationPageFragsStyle.css}">
+<!-- <link rel="stylesheet" th:href="@{/css/locationPageFragsStyle.css}">-->
+
+ <style>
+
+ .townFragment{
+ background-color: rgb(206, 153, 253);
+ color: black;
+ border-color: white;
+ align-content: center;
+ text-align: center;
+ border-radius: 25px;
+ max-width: 800px;
+ margin: 0 auto;
+
+ }
+ .townPageFrag{
+ background: rgb(41, 41, 41);
+ color: wheat;
+ }
+
+ #return{
+ padding-bottom: 10px;
+ }
+ iframe{
+ margin-top: 20px;
+ margin-bottom: 60px;
+ border: white 2px solid;
+ }
+ H1{
+ padding-top: 5px;
+ padding-bottom:3px ;
+ margin-bottom: 0;
+ }
+ #townHeader{
+ margin: 0;
+ padding: 0;
+
+ }
+ #checkpointList{
+ list-style: none;
+ }
+
+
+ </style>
</head>
<body >
<header th:insert="~{/fragments/Templating.html::header}"></header>
<main>
-
<hr style="height:40px; visibility:hidden;" />
+ <section class="townFragment">
+
+
+ <H1 th:text="${town.getTownName()}"></H1>
+ <hr style="height:20px; visibility:hidden;" />
+
+ <div th:each="trail, indexValue:${trails}">
+ <li id="checkpointList">
+ <div><a th:href="'/trails/'+${trail.getTrailName().replace(' ', '-')}" th:text="${trail.getTrailName()}"></a></div>
+ <ul></ul>
+ </li>
+
+ </div>
+ </section>
<hr style="height:40px; visibility:hidden;" />
</main>
diff --git a/src/main/resources/templates/fragments/trailsPageFrags.html b/src/main/resources/templates/fragments/trailsPageFrags.html
index 296cd2d153d1671b467a27a78f5a1994bdb77806..b4cd3bd80899852ff2f6317bed27e39f6eeb8f9c 100644
--- a/src/main/resources/templates/fragments/trailsPageFrags.html
+++ b/src/main/resources/templates/fragments/trailsPageFrags.html
@@ -105,6 +105,7 @@
</div>
+ <hr style="height:20px; visibility:hidden;" />
</article>
<hr style="height:40px; visibility:hidden;" />
</main>