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

finish index refactoring

Browse Source
This commit is contained in:
Christoph
2020-04-10 16:57:34 +02:00
parent 65782c19e2
commit 78e1876a43
2 changed files with 25 additions and 36 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/mops/gruppen2/controller/GruppenfindungController.java
View File

@ -39,7 +39,7 @@ public class GruppenfindungController {
User user = new User(token); User user = new User(token);
model.addAttribute("gruppen", projectionService.projectUserGroups(user)); model.addAttribute("groups", projectionService.projectUserGroups(user));
return "index"; return "index";
} }

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

@ -1,47 +1,36 @@
<!DOCTYPE html> <!DOCTYPE html>
<html lang="en" xmlns:th="http://www.thymeleaf.org" <html lang="de" xmlns:th="http://www.thymeleaf.org"
th:replace="~{mopslayout :: html(name='Gruppenbildung', headcontent=~{:: headcontent}, navigation=~{:: navigation}, bodycontent=~{:: bodycontent})}"> th:replace="~{mopslayout :: html(
<head> name='Gruppenfindung',
<meta charset="utf-8"> title='Meine Gruppen',
<title>Meine Gruppen</title> headcontent=~{fragments/general :: headcontent},
<th:block th:fragment="headcontent"> navigation=~{fragments/general :: nav(current='index')},
<!-- Links, Skripts, Styles hier einfügen! --> bodycontent=~{:: bodycontent})}">
<link th:href="@{/style.css}" href="../static/style.css" rel="stylesheet"/>
</th:block>
</head>
<body> <body>
<header>
<nav class="navigation navigation-secondary" is="mops-navigation" th:fragment="navigation">
<ul>
<li class="active">
<a th:href="@{/gruppen2}">Gruppen</a>
</li>
<li>
<a th:href="@{/gruppen2/create}">Erstellen</a>
</li>
<li>
<a th:href="@{/gruppen2/search}">Suche</a>
</li>
</ul>
</nav>
</header>
<main th:fragment="bodycontent"> <main th:fragment="bodycontent">
<div class="container-fluid"> <div class="container-fluid">
<h1 class="def-cursor">Meine Gruppen</h1> <h1 class="def-cursor">Meine Gruppen</h1>
<div class="mt-3" th:each="gruppe: ${gruppen}">
<div class="con-div p-2"> <!--Gruppenliste belegte Gruppen-->
<span class="con-h"> <div class="mt-3" th:each="group: ${groups}">
<a th:href="@{/gruppen2/details/{id}(id=${gruppe.getId()})}" <div class="content p-2">
th:text="${gruppe.getTitle()}"></a> <div class="content-heading">
<span class="badge badge-pill badge-success badge-ver float-r" <a class="link" th:href="@{/gruppen2/details/{id}(id=${group.getId()})}"
th:if='${gruppe.getType() == lecture}'>Veranstaltung</span> th:text="${group.getTitle()}"></a>
</span>
<div class="con-p p-2"> <span th:replace="~{fragments/gruppen :: badges}"></span>
<span th:text="${#strings.abbreviate(gruppe.getDescription(),300)}"></span> </div>
<div class="content-text p-2">
<span th:text="${group.getDescription()}"></span>
</div> </div>
</div> </div>
</div> </div>
</div> </div>
</main> </main>
</body> </body>
</html> </html>