From 75a4701bd0aae6374a898ab218d5061a4c30fdcd Mon Sep 17 00:00:00 2001
From: kasch309 <fr3sh3rpi55a@gmail.com>
Date: Wed, 18 Mar 2020 14:21:05 +0100
Subject: [PATCH] fix table and functionality

---
 .../resources/templates/detailsMember.html    |  2 +-
 src/main/resources/templates/editMembers.html | 25 +++++++++++--------
 2 files changed, 16 insertions(+), 11 deletions(-)

diff --git a/src/main/resources/templates/detailsMember.html b/src/main/resources/templates/detailsMember.html
index 1274df0..6753811 100644
--- a/src/main/resources/templates/detailsMember.html
+++ b/src/main/resources/templates/detailsMember.html
@@ -51,7 +51,7 @@
                     <h2 style="display: inline-block; margin: 0">Mitglieder</h2>
                     <div th:if='${group.getRoles().get(user.getUser_id()) == admin}'>
                         <form method="get" action="/gruppen2/details/members">
-                                <button th:name="group_id" th:value="${group.getId()}" class="btn btn-secondary" type="submit" style="background: slategrey; float: right" >Mitglieder bearbeiten</button>
+                                <button th:name="group_id" th:value="${group.getId()}" class="btn btn-secondary" type="submit" style="background: slategrey; margin-top: 200px; float: right" >Mitglieder bearbeiten</button>
                         </form>
                     </div>
                     <p></p>
diff --git a/src/main/resources/templates/editMembers.html b/src/main/resources/templates/editMembers.html
index 2cebc86..9988370 100644
--- a/src/main/resources/templates/editMembers.html
+++ b/src/main/resources/templates/editMembers.html
@@ -29,22 +29,27 @@
         <div class="row">
             <div class="col-9">
                 <div class="shadow-sm p-4" style="border: 10px solid aliceblue; background: aliceblue">
-                    <table class="table-striped">
+                    <table class="table">
                         <thead>
                         <tr>
                             <th scope="col">Mitglied</th>
                             <th scope="col">Rolle</th>
-                            <th scope="col">Optionen</th>
+                            <th scope="col" style="width: 320px">Optionen</th>
                         </tr>
                         </thead>
-                        <tr th:each="member : ${group.getMembers()}">
-                            <th th:value="${member.getUser_id()}"></th>
-                            <th ></th>
-                            <th>
-                                <button class="btn btn-warning">Rolle ändern</button> <!-- th:if -->
-                                <button class="btn btn-danger">Mitglied entfernen</button>
-                            </th>
-                        </tr>
+                        <tbody class="table-striped">
+                            <tr th:each="member : ${group.getMembers()}">
+                                <th th:text="${member.getUser_id()}"></th>
+                                <td>
+                                    <span th:if='${group.getRoles().get(member.getUser_id()) == admin}'>Mitglied</span>
+                                    <span th:if='${group.getRoles().get(member.getUser_id()) != admin}'>Admin</span>
+                                </td>
+                                <td>
+                                    <button class="btn btn-warning">Rolle ändern</button> <!-- th:if -->
+                                    <button class="btn btn-danger">Mitglied entfernen</button>
+                                </td>
+                            </tr>
+                        </tbody>
                     </table>
                 </div>
             </div>