From b6c5fcda656bbc4f568c17d39bd68c0d88d706b2 Mon Sep 17 00:00:00 2001
From: kasch309 <fr3sh3rpi55a@gmail.com>
Date: Thu, 19 Mar 2020 14:22:39 +0100
Subject: [PATCH] fix styling, rename error page

---
 .../controller/Gruppen2Controller.java        |  4 +--
 src/main/resources/templates/create.html      |  2 +-
 .../resources/templates/createLecture.html    |  2 +-
 .../resources/templates/detailsMember.html    |  6 ++--
 .../resources/templates/detailsNoMember.html  |  2 +-
 src/main/resources/templates/editMembers.html | 34 +++++++++++--------
 .../{errorRenameLater.html => error.html}     |  2 +-
 src/main/resources/templates/index.html       |  2 +-
 src/main/resources/templates/search.html      |  2 +-
 9 files changed, 29 insertions(+), 27 deletions(-)
 rename src/main/resources/templates/{errorRenameLater.html => error.html} (83%)

diff --git a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
index 0b200d6..d1e7d5e 100644
--- a/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
+++ b/src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
@@ -157,7 +157,7 @@ public class Gruppen2Controller {
         Account account = keyCloakService.createAccountFromPrincipal (token);
         User user = new User(account.getName(),account.getGivenname(),account.getFamilyname(),account.getEmail());
         Group group = userService.getGroupById(id);
-        if(group.getMembers().contains(user)) return "errorRenameLater"; //hier soll eigentlich auf die bereits beigetretene Gruppe weitergeleitet werden
+        if(group.getMembers().contains(user)) return "error"; //hier soll eigentlich auf die bereits beigetretene Gruppe weitergeleitet werden
         controllerService.addUser(account,id);
         return "redirect:/gruppen2/";
     }
@@ -229,6 +229,6 @@ public class Gruppen2Controller {
 
     @GetMapping("*")
     public String defaultLink() {
-        return "errorRenameLater";
+        return "error";
     }
 }
diff --git a/src/main/resources/templates/create.html b/src/main/resources/templates/create.html
index c43add0..ba9b175 100644
--- a/src/main/resources/templates/create.html
+++ b/src/main/resources/templates/create.html
@@ -34,7 +34,7 @@
             <div class="col-10">
                 <h1>Gruppenerstellung</h1>
                 <form method="post" action="/gruppen2/createGroup">
-                    <div class="shadow p-2" style=" border: 10px solid aliceblue; background: aliceblue">
+                    <div class="shadow p-2" style=" border: 10px solid aliceblue; border-radius: 5px; background: aliceblue">
                         <div class="form-group">
                             <label for="titel">Titel</label>
                             <input type="text" class="form-control" id="titel" th:name="title" required>
diff --git a/src/main/resources/templates/createLecture.html b/src/main/resources/templates/createLecture.html
index 4325d66..aa77402 100644
--- a/src/main/resources/templates/createLecture.html
+++ b/src/main/resources/templates/createLecture.html
@@ -37,7 +37,7 @@
         <div class="row">
             <div class="col-10">
                 <h1>Veranstaltung erstellen</h1>
-                <div class="shadow p-2" style=" border: 10px solid aliceblue; background: aliceblue">
+                <div class="shadow p-2" style=" border: 10px solid aliceblue; border-radius: 5px; background: aliceblue">
                     <form method="post" action="/gruppen2/createLecture" enctype="multipart/form-data">
                         <div class="form-group">
                             <label for="titel">Titel</label>
diff --git a/src/main/resources/templates/detailsMember.html b/src/main/resources/templates/detailsMember.html
index 1298e46..fdeccd5 100644
--- a/src/main/resources/templates/detailsMember.html
+++ b/src/main/resources/templates/detailsMember.html
@@ -30,7 +30,7 @@
 <main th:fragment="bodycontent">
     <div class="container-fluid">
         <div class="row">
-            <div class="col-9 shadow-sm p-4" style="border: 10px solid aliceblue; background: aliceblue">
+            <div class="col-9 shadow-sm p-4" style="border: 10px solid aliceblue;  border-radius: 5px; background: aliceblue">
                 <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>
@@ -56,9 +56,7 @@
                     <h2>Mitglieder</h2>
                     <div th:if='${group.getRoles().get(user.getUser_id()) == admin}'>
                         <form method="get" th:action="@{/gruppen2/details/members/{id}(id=${group.getId()})}">
-                            <button class="btn btn-secondary" style="background: slategrey; float: right">
-                                Mitglieder bearbeiten
-                            </button>
+                            <button class="btn btn-secondary" style="background: slategrey; float: right">Mitglieder bearbeiten</button>
                         </form>
                     </div>
                     <br>
diff --git a/src/main/resources/templates/detailsNoMember.html b/src/main/resources/templates/detailsNoMember.html
index 0b3a032..d4a51e2 100644
--- a/src/main/resources/templates/detailsNoMember.html
+++ b/src/main/resources/templates/detailsNoMember.html
@@ -31,7 +31,7 @@
     <div class="container-fluid">
         <div class="row">
             <div class="col-9">
-                <div class="shadow-sm p-4" style="border: 10px solid aliceblue; background: aliceblue">
+                <div class="shadow-sm p-4" style="border: 10px solid aliceblue; border-radius: 5px; background: aliceblue">
                     <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>
diff --git a/src/main/resources/templates/editMembers.html b/src/main/resources/templates/editMembers.html
index 5c67b93..d621618 100644
--- a/src/main/resources/templates/editMembers.html
+++ b/src/main/resources/templates/editMembers.html
@@ -35,7 +35,7 @@
     <div class="container-fluid">
         <div class="row">
             <div class="col-9">
-                <div class="shadow p-2" style="border: 10px solid aliceblue; background: aliceblue">
+                <div class="shadow p-2" style="border: 10px solid aliceblue; border-radius: 5px; background: aliceblue">
                     <!-- absichern im controller nicht vergessen -->
                     <div class="form-group pt-4" th:if="${account.getRoles().contains('orga')}">
                         <form method="post" action="/gruppen2/details/members/addUsersFromCsv" enctype="multipart/form-data">
@@ -47,7 +47,7 @@
                                     </div>
                                 </div>
                                 <div class="col-3">
-                                    <button th:name="group_id" th:value="${group.getId()}" class="btn btn-primary" type="submit" style="background: #52a1eb; border-style: none">Mitglieder hinzufügen</button>
+                                    <button th:name="group_id" th:value="${group.getId()}" class="btn btn-primary" type="submit" style="background: #52a1eb; border-style: none; float: right" >Mitglieder hinzufügen</button>
                                 </div>
                             </div>
                         </form>
@@ -57,7 +57,7 @@
                         <tr>
                             <th scope="col">Mitglied</th>
                             <th scope="col" style="width: 180px">Rolle</th>
-                            <th scope="col" style="width: 270px">Optionen</th>
+                            <th scope="col" >Optionen</th>
                         </tr>
                         </thead>
                         <tbody class="table-striped">
@@ -69,23 +69,27 @@
                                     <span th:if='${group.getRoles().get(member.getUser_id()) == admin}'>Admin</span>
                                 </td>
                                 <td>
-                                    <form method="post" action="/gruppen2/details/members/changeRole">
-                                        <input type="hidden" th:name="group_id" th:value="${group.getId()}">
-                                        <input type="hidden" th:name="user_id" th:value="${member.getUser_id()}">
-                                        <button type="submit"  class="btn btn-warning btn-sm">Rolle ändern</button><!-- th:if -->
-                                    </form>
-                                    <form method="post" action="/gruppen2/details/members/deleteUser">
-                                        <input type="hidden" th:name="group_id" th:value="${group.getId()}">
-                                        <input type="hidden" th:name="user_id" th:value="${member.getUser_id()}">
-                                        <button class="btn btn-danger btn-sm">Mitglied entfernen</button>
-                                    </form>
+                                    <div class="text-right btn-toolbar" style="float: right" role="toolbar">
+                                        <form method="post" action="/gruppen2/details/members/changeRole">
+                                            <input type="hidden" th:name="group_id" th:value="${group.getId()}">
+                                            <input type="hidden" th:name="user_id" th:value="${member.getUser_id()}">
+                                            <button type="submit"  class="btn btn-warning btn-sm" style="margin: 5px">Rolle ändern</button><!-- th:if -->
+                                        </form>
+                                        <form method="post" action="/gruppen2/details/members/deleteUser">
+                                            <input type="hidden" th:name="group_id" th:value="${group.getId()}">
+                                            <input type="hidden" th:name="user_id" th:value="${member.getUser_id()}">
+                                            <button class="btn btn-danger btn-sm" style="margin: 5px">Mitglied entfernen</button>
+                                        </form>
+                                    </div>
                                 </td>
                             </tr>
                         </tbody>
                     </table>
-                    <button type="button" class="btn btn-primary" style="background: #52a1eb; border-style: none">
-                        <a th:href="@{/gruppen2/details(id=${group.getId()})}" style="color: white">Fertig</a>
+                    <button type="button" class="btn btn-primary" style="background: #52a1eb; float: right; border-style: none">
+                        <a th:href="@{/gruppen2/details(id=${group.getId()})}" style="color: white; margin: 5px">Fertig</a>
                     </button>
+                    <br>
+                    <br>
                 </div>
             </div>
         </div>
diff --git a/src/main/resources/templates/errorRenameLater.html b/src/main/resources/templates/error.html
similarity index 83%
rename from src/main/resources/templates/errorRenameLater.html
rename to src/main/resources/templates/error.html
index 1344e10..80038e7 100644
--- a/src/main/resources/templates/errorRenameLater.html
+++ b/src/main/resources/templates/error.html
@@ -10,7 +10,7 @@
 </head>
 <body>
 <div class="mx-auto" style="vertical-align: center; horiz-align: center; top: 50%; left: 50%; margin-top: 200px">
-    <div class="text-center" style="background: aliceblue; align-items: center; margin: auto; width: 1000px; vertical-align: center; padding: 50px; display: block">
+    <div class="text-center shadow-sm p-2" style="border-radius: 5px; background: aliceblue; align-items: center; margin: auto; width: 1000px; vertical-align: center; padding: 50px; display: block">
         <h1 style="text-align: center">Da ist etwas schiefgelaufen!</h1>
         <h2 style="text-align: center">Die Seite, nach der du suchst, scheint nicht zu existieren.</h2>
         <br>
diff --git a/src/main/resources/templates/index.html b/src/main/resources/templates/index.html
index da57d1c..39fda21 100644
--- a/src/main/resources/templates/index.html
+++ b/src/main/resources/templates/index.html
@@ -42,7 +42,7 @@
                     </h3>
                     <br>
                     <div th:each="gruppe: ${gruppen}">
-                        <div class="shadow-sm p-4" style="border: none; background: aliceblue">
+                        <div class="shadow-sm p-4" style="border: none; border-radius: 5px; background: aliceblue">
                             <h3 style="color: dodgerblue; font-weight: bold;">
                                 <a th:href="@{/gruppen2/details/{id}(id=${gruppe.getId()})}" th:text="${gruppe.getTitle()}"></a>
                             </h3>
diff --git a/src/main/resources/templates/search.html b/src/main/resources/templates/search.html
index 3a8918f..6bcec81 100644
--- a/src/main/resources/templates/search.html
+++ b/src/main/resources/templates/search.html
@@ -33,7 +33,7 @@
             <div class="col-10">
                 <h1>Gruppensuche</h1>
                 <form action="/gruppen2/findGroup" method="get">
-                    <div class="shadow" style="border: 10px solid aliceblue; background: aliceblue">
+                    <div class="shadow" style="border: 10px solid aliceblue; border-radius: 5px; background: aliceblue">
                         <div class="form-group">
                             <label for="suchleiste">Suchbegriff:</label>
                             <input id="suchleiste" class="form-control" placeholder="z.B. Programmieren, Lerngruppe, ..." th:name="suchbegriff" type="text">