From e0db7584ac0bc84ae99c1e670575028e9c13bf67 Mon Sep 17 00:00:00 2001
From: kasch309 <fr3sh3rpi55a@gmail.com>
Date: Wed, 18 Mar 2020 16:00:11 +0100
Subject: [PATCH] Improve styling on several templates

---
 src/main/resources/templates/detailsMember.html   | 11 ++++++++---
 src/main/resources/templates/detailsNoMember.html | 14 ++++++++------
 src/main/resources/templates/index.html           |  6 ++++--
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/src/main/resources/templates/detailsMember.html b/src/main/resources/templates/detailsMember.html
index 63ae972..16badfa 100644
--- a/src/main/resources/templates/detailsMember.html
+++ b/src/main/resources/templates/detailsMember.html
@@ -31,7 +31,6 @@
             <div class="col-9">
                 <div class="shadow-sm p-4" style="border: 10px solid aliceblue; background: aliceblue">
                         <h1 style="color: black; font-weight: bold" th:text="${group.getTitle()}"></h1>
-                        <p style="font-weight: bold">
                         <h3>
                             <span class="badge badge-pill badge-dark" style="background: darkslategray" th:if='${group.getVisibility() == group.getVisibility().PRIVATE }'>Private Gruppe</span>
                             <span class="badge badge-pill badge-primary" th:if="${group.getVisibility() == group.getVisibility().PUBLIC}">Öffentliche Gruppe</span>
@@ -43,9 +42,15 @@
                         </div>
                     <br>
                         <div class="text-right">
-                            <form method="post" action="/gruppen2/leaveGroup">
-                                <button th:value="${group.getId()}" th:name="group_id" class="btn btn-danger" type="submit" style="border-style: none;">Gruppe verlassen</button>
+                            <form>
+                                <button class="btn btn-primary" style="background: dodgerblue; border: none">
+                                    <a th:href="@{/gruppen2}" style="color: white">Zurück</a>
+                                </button>
+                                <form method="post" action="/gruppen2/leaveGroup">
+                                    <button th:value="${group.getId()}" th:name="group_id" class="btn btn-danger" type="submit" style="border-style: none;">Gruppe verlassen</button>
+                                </form>
                             </form>
+
                         </div>
                 </div>
             </div>
diff --git a/src/main/resources/templates/detailsNoMember.html b/src/main/resources/templates/detailsNoMember.html
index 44f1dfd..740f1bf 100644
--- a/src/main/resources/templates/detailsNoMember.html
+++ b/src/main/resources/templates/detailsNoMember.html
@@ -29,13 +29,15 @@
         <div class="row">
             <div class="col-9">
                 <div class="shadow-sm p-4" style="border: 10px solid aliceblue; background: aliceblue">
-                        <h1 style="color: dodgerblue; font-weight: bold" th:text="${group.getTitle()}"></h1>
-                        <p style="font-weight: bold">
-                            <span class="badge badge-pill badge-dark" style="background: darkslategray" th:if="${group.getVisibility() == group.getVisibility().PRIVATE }">Private Gruppe</span>
+                        <h1 style="color: black; font-weight: bold" th:text="${group.getTitle()}"></h1>
+                        <h3>
+                            <span class="badge badge-pill badge-dark" style="background: darkslategray" th:if='${group.getVisibility() == group.getVisibility().PRIVATE }'>Private Gruppe</span>
                             <span class="badge badge-pill badge-primary" th:if="${group.getVisibility() == group.getVisibility().PUBLIC}">Öffentliche Gruppe</span>
-                            <span class="badge badge-pill badge-success" style="background: lightseagreen" th:if="${group.getType() == group.getType().LECTURE}"> Veranstaltung</span>
-                        </p>
-                        <p th:text="${group.getDescription()}"></p>
+                            <span class="badge badge-pill badge-success" style="background: lightseagreen" th:if='${group.getType() == group.getType().LECTURE}'> Veranstaltung</span>
+                        </h3>
+                    <div class="shadow-sm p-4" style="background: white">
+                        <p style="overflow-wrap: break-word" th:text="${group.getDescription()}"></p>
+                    </div>
                         <div class="form-group">
                             <div class="text-right">
                                 <form method="post" action="/gruppen2/detailsBeitreten">
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index e7ba682..f9fab43 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -40,10 +40,12 @@
                     <div th:each="gruppe: ${gruppen}">
                         <div class="shadow-sm p-4" style="border: none; background: aliceblue">
 
-                            <h3 style="color: dodgerblue; font-weight: bold;">
+                            <h3 style="color: black; font-weight: bold;">
                                 <a th:href="@{/gruppen2/details(id=${gruppe.getId()})}" th:text="${gruppe.getTitle()}"></a>
                             </h3>
-                            <p style="overflow-wrap: break-word" th:text="${#strings.abbreviate(gruppe.getDescription(),300)}"></p>
+                            <div class="shadow-sm p-4" style="background: white">
+                                <p style="overflow-wrap: break-word" th:text="${#strings.abbreviate(gruppe.getDescription(),300)}"></p>
+                            </div>
                         </div>
                         <br>
                     </div>