Skip to content
Snippets Groups Projects
Commit 78fd9172 authored by Robert Goldmann's avatar Robert Goldmann
Browse files

#264 - added feedback messages for wrong password and successful logout

parent b4a526d4
No related branches found
No related tags found
No related merge requests found
package de.deadlocker8.budgetmaster.controller; package de.deadlocker8.budgetmaster.controller;
import org.springframework.stereotype.Controller; import org.springframework.stereotype.Controller;
import org.springframework.ui.Model;
import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestParam;
import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletRequest;
import java.util.Map;
@Controller @Controller
public class LoginController extends BaseController public class LoginController extends BaseController
{ {
@RequestMapping("/login") @RequestMapping("/login")
public String login(HttpServletRequest request) public String login(HttpServletRequest request, Model model)
{ {
Map<String, String[]> paramMap = request.getParameterMap();
if(paramMap.containsKey("error"))
model.addAttribute("isError", true);
if(paramMap.containsKey("logout"))
model.addAttribute("isLogout", true);
request.getSession().setAttribute("preLoginURL", request.getHeader("Referer")); request.getSession().setAttribute("preLoginURL", request.getHeader("Referer"));
return "login"; return "login";
} }
......
...@@ -362,6 +362,7 @@ settingstab.button.server.local=Lokaler Server ...@@ -362,6 +362,7 @@ settingstab.button.server.local=Lokaler Server
login.password=Passwort login.password=Passwort
login.button=Login login.button=Login
logout.success=Erfolgreich abgemeldet.
datepicker.label.month=Monat: datepicker.label.month=Monat:
datepicker.label.year=Jahr: datepicker.label.year=Jahr:
......
...@@ -361,6 +361,7 @@ settingstab.button.server.local=Local Server ...@@ -361,6 +361,7 @@ settingstab.button.server.local=Local Server
login.password=Password login.password=Password
login.button=Login login.button=Login
logout.success=Successfully logged out.
datepicker.label.month=Month: datepicker.label.month=Month:
datepicker.label.year=Year: datepicker.label.year=Year:
......
...@@ -309,6 +309,19 @@ ul.dropdown-content.select-dropdown li.selected { ...@@ -309,6 +309,19 @@ ul.dropdown-content.select-dropdown li.selected {
padding: 5px 32px 12px 32px; padding: 5px 32px 12px 32px;
} }
.login-button {
text-transform: none;
}
.login-margin-top {
margin-top: 20px;
}
.login-message {
width: auto;
margin: auto
}
.hidden { .hidden {
display: none; display: none;
} }
......
...@@ -20,14 +20,40 @@ ...@@ -20,14 +20,40 @@
<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/> <input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
<input type="hidden" name="username" value="Default"> <input type="hidden" name="username" value="Default">
<div class="row"> <div class="row no-margin-bottom">
<div class="input-field col s12"> <div class="input-field col s12">
<input id="password" type="password" name="password"> <input id="password" type="password" name="password">
<label for="password">${locale.getString("login.password")}</label> <label for="password">${locale.getString("login.password")}</label>
</div> </div>
</div> </div>
<div class="row"> <#if isError??>
<div class="row no-margin-bottom">
<div class="col s12 center-align">
<table class="text-red login-message">
<tr>
<td><i class="material-icons">warning</i></td>
<td>${locale.getString("warning.wrong.password")}</td>
</tr>
</table>
</div>
</div>
</#if>
<#if isLogout??>
<div class="row no-margin-bottom">
<div class="col s12 center-align">
<table class="text-dark-green login-message">
<tr>
<td><i class="material-icons">info_outline</i></td>
<td>${locale.getString("logout.success")}</td>
</tr>
</table>
</div>
</div>
</#if>
<div class="row login-margin-top">
<div class="col s12 right-align"> <div class="col s12 right-align">
<button class="btn waves-effect waves-light budgetmaster-blue" type="submit" name="action"> <button class="btn waves-effect waves-light budgetmaster-blue" type="submit" name="action">
<i class="material-icons left">send</i>${locale.getString("login.button")} <i class="material-icons left">send</i>${locale.getString("login.button")}
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment