From 6148d3514489d5f96c65c76c1303e5c491b75590 Mon Sep 17 00:00:00 2001 From: Julien Cartigny Date: Thu, 8 Jun 2017 07:40:10 +0200 Subject: [PATCH] Fixing message in login page --- pom.xml | 19 +++++++++++++++---- src/main/java/fr/plil/sio/web/mvc/LoginController.java | 2 +- src/main/webapp/WEB-INF/pages/login.jsp | 11 +---------- 3 files changed, 17 insertions(+), 15 deletions(-) diff --git a/pom.xml b/pom.xml index a63848d..d3a5803 100644 --- a/pom.xml +++ b/pom.xml @@ -28,10 +28,6 @@ org.springframework.boot spring-boot-starter-data-jpa - - org.springframework.boot - spring-boot-starter-data-rest - org.springframework.boot spring-boot-starter-web @@ -64,6 +60,21 @@ h2 runtime + + org.webjars + webjars-locator + 0.30 + + + org.webjars.npm + jquery + 3.2.1 + + + org.webjars.npm + bootstrap + 3.3.7 + diff --git a/src/main/java/fr/plil/sio/web/mvc/LoginController.java b/src/main/java/fr/plil/sio/web/mvc/LoginController.java index ed6af96..4082cb5 100644 --- a/src/main/java/fr/plil/sio/web/mvc/LoginController.java +++ b/src/main/java/fr/plil/sio/web/mvc/LoginController.java @@ -14,7 +14,7 @@ public class LoginController { ModelAndView modelAndView = new ModelAndView("login"); if (error != null) { - modelAndView.addObject("error", "Your username and password is invalid."); + modelAndView.addObject("message", "Your username and password is invalid."); } if (logout != null) { diff --git a/src/main/webapp/WEB-INF/pages/login.jsp b/src/main/webapp/WEB-INF/pages/login.jsp index dc318f8..45aa0f0 100644 --- a/src/main/webapp/WEB-INF/pages/login.jsp +++ b/src/main/webapp/WEB-INF/pages/login.jsp @@ -7,16 +7,7 @@
- -

- Invalid username and password. -

- - -

- You have been logged out. -

- +

-- libgit2 0.21.2