From 68124316d0ee7e7643212c54a181ea24207481ae Mon Sep 17 00:00:00 2001
From: jotty <jottyfan@gmx.de>
Date: Sun, 12 Mar 2023 08:30:34 +0100
Subject: [PATCH] login with email in keycloak

---
 build.gradle                                                | 2 +-
 src/main/resources/static/index.html                        | 4 ++--
 src/main/resources/templates/dashboard.html                 | 2 +-
 src/main/resources/templates/registration/registration.html | 2 +-
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 153b1b3..6a3ede4 100644
--- a/build.gradle
+++ b/build.gradle
@@ -18,7 +18,7 @@ apply plugin: 'war'
 apply plugin: 'application'
 
 group = 'de.jottyfan.camporganizer'
-version = '0.3.2'
+version = '0.3.3'
 sourceCompatibility = 17
 mainClassName = "de.jottyfan.camporganizer.Main"
 
diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html
index 335e8b6..10c98bd 100644
--- a/src/main/resources/static/index.html
+++ b/src/main/resources/static/index.html
@@ -26,8 +26,8 @@
     </div>
     <div class="collapse navbar-collapse navbar-right" id="navbarSupportedContent">
       <ul class="navbar-nav mr-auto">
-        <li class="nav-item"><a class="nav-link" href="#top" onclick="template.reload_main('freizeiten.html')">Freizeiten</a></li>
-        <li class="nav-item"><a class="nav-link" href="/CampOrganizer2/camplist">Anmeldung</a></li>
+        <li class="nav-item"><a class="nav-link" href="#top" onclick="template.reload_main('freizeiten.html')">Allgemeines</a></li>
+        <li class="nav-item"><a class="nav-link" href="/CampOrganizer2/camplist">Freizeiten</a></li>
         <li class="nav-item"><a class="nav-link" href="#top" onclick="template.reload_main('verein.html')">Verein</a></li>
         <li class="nav-item dropdown">
           <a class="nav-link dropdown-toggle" href="#" id="navbarDropdown" role="button" data-bs-toggle="dropdown" aria-expanded="false">
diff --git a/src/main/resources/templates/dashboard.html b/src/main/resources/templates/dashboard.html
index d537be8..05f7448 100644
--- a/src/main/resources/templates/dashboard.html
+++ b/src/main/resources/templates/dashboard.html
@@ -30,7 +30,7 @@
 		<ul class="navbar-nav mb-2 mb-lg-0" sec:authorize="hasRole('admin')">
 			<li class="nav-item"><a th:href="@{/admin}" class="btn btn-secondary btn-icon-silent">Administration</a></li>
 		</ul>
-		<ul class="navbar-nav mb-2 mb-lg-0">
+		<ul class="navbar-nav mb-2 mb-lg-0" sec:authorize="hasAnyRole('nextcloudlink')">
 			<li class="nav-item"><a href="https://www.onkelwernerfreizeiten.de/cloud" class="btn btn-secondary btn-icon-silent" target="_blank">Nextcloud</a></li>
 		</ul>
 	</th:block>
diff --git a/src/main/resources/templates/registration/registration.html b/src/main/resources/templates/registration/registration.html
index 873096d..5a54080 100644
--- a/src/main/resources/templates/registration/registration.html
+++ b/src/main/resources/templates/registration/registration.html
@@ -98,7 +98,7 @@
 							<div id="createlogin" class="row" th:if="${#strings.isEmpty(currentUser)}">
 								<div class="col-sm-6 rowdist">
 									<span class="error"	th:each="error : ${#fields.errors('login')}">[[${error}]]<br /></span>
-									<input type="text" placeholder="Login" th:field="*{login}" th:class="${'form-control ' + (#fields.hasErrors('login') ? 'inputerror' : '')}" />
+									<input type="text" placeholder="E-Mail" th:field="*{login}" th:class="${'form-control ' + (#fields.hasErrors('login') ? 'inputerror' : '')}" />
 								</div>
 								<div class="col-sm-6 rowdist">
 									<span class="error"	th:each="error : ${#fields.errors('password')}">[[${error}]]<br /></span>