login with email in keycloak

This commit is contained in:
Jörg Henke 2023-03-12 08:30:34 +01:00
parent 6d12e6b9e2
commit 68124316d0
4 changed files with 5 additions and 5 deletions

View File

@ -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"

View File

@ -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">

View File

@ -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>

View File

@ -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>