christoph/lecture-professional-software-development
1
Fork 0
Code Activity

Merge remote-tracking branch 'origin/UI-Improvements'

Browse Source 
# Conflicts:
#	src/main/java/mops/gruppen2/controller/Gruppen2Controller.java
#	src/main/resources/templates/detailsMember.html
This commit is contained in:
killerber4t
2020-03-14 23:47:41 +01:00
parent 916a386179 d3c5ded6d0
commit 1ad3ad8bab
5 changed files with 46 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/main/resources/templates/create.html
View File

@ -29,7 +29,7 @@
<h1>Gruppenerstellung</h1>
<div class="container-fluid">
<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; background: aliceblue">
<div class="form-group">
<label for="titel">Titel</label>
<input type="text" class="form-control" id="titel" th:name="title" required>
@ -38,11 +38,9 @@
<label for="beschreibung">Beschreibung</label>
<textarea th:name="beschreibung" class="form-control" id="beschreibung" rows="3" required></textarea>
</div>
<div class="checkbox p-2">
<label for="visibility"></label>
<input type="checkbox" id="visibility" > Privat
<label for="groupType" class="pr-5"></label>
<input type="checkbox" id="groupType"> Veranstaltung
<div class="custom-control custom-checkbox">
<input type="checkbox" id="visibility" class="custom-control-input" th:name="visibility">
<label class="custom-control-label" for="visibility">Private Gruppe</label>
</div>
<div class="form-group">
<label for="sel1"></label>

1
src/main/resources/templates/detailsMember.html
View File

@ -43,6 +43,7 @@
</div>
</form>
</div>
<div class="col-3" style="white-space: nowrap">
<div>
<h2 style="display: inline-block; margin: 0">Mitglieder</h2>

38
src/main/resources/templates/index.html
View File

@ -25,19 +25,35 @@
</nav>
</header>
<main th:fragment="bodycontent">
<h1>Meine Gruppen</h1>
<div class="container-fluid">
<form action="/" method="get">
<div th:each="gruppe: ${gruppen}">
<div style="border: 10px solid aliceblue; background: aliceblue">
<h3>
<a th:href="@{/gruppen2/details(id=${gruppe.getId()})}" style="color: dodgerblue; font-weight: bold" th:text="${gruppe.getTitle()}"></a>
</h3>
<p th:text="${gruppe.getDescription()}"></p>
</div>
<br>
<div class="row" >
<div class="col-9">
<h1>Meine Gruppen</h1>
<form action="/" method="get">
<div th:each="gruppe: ${gruppen}">
<div style="border: 10px solid aliceblue; background: aliceblue">
<h3>
<a th:href="@{/gruppen2/details(id=${gruppe.getId()})}" style="color: dodgerblue; font-weight: bold" th:text="${gruppe.getTitle()}"></a>
</h3>
<p th:text="${gruppe.getDescription()}"></p>
</div>
<br>
</div>
</form>
</div>
</form>
<div class="col-3" >
<div class="container-fluid" style="background: aliceblue">
<div>
<h2 th:text="${user.getUser_id()}" style="text-align: center">user_id</h2>
<h3>
<span th:text="${user.getGivenname()}">username</span>
<span th:text="${user.getFamilyname()}">usersurname</span>
</h3>
<small th:text="${user.getEmail()}">usermail</small>
</div>
</div>
</div>
</div>
</div>
</main>
</body>