From a8656157f5435d8ff595222e161741e033412c7e Mon Sep 17 00:00:00 2001 From: Julien Cartigny Date: Thu, 8 Jun 2017 07:42:09 +0200 Subject: [PATCH] Support for bootstrap and jquery via webjars --- src/main/java/fr/plil/sio/web/mvc/ApplicationSecurityConfiguration.java | 1 + src/main/webapp/WEB-INF/pages/footer.jsp | 4 ++++ src/main/webapp/WEB-INF/pages/header.jsp | 10 ++++++++++ src/main/webapp/WEB-INF/pages/login.jsp | 9 ++------- src/main/webapp/WEB-INF/pages/newUser.jsp | 14 ++------------ src/main/webapp/WEB-INF/pages/viewUsers.jsp | 14 ++------------ 6 files changed, 21 insertions(+), 31 deletions(-) create mode 100644 src/main/webapp/WEB-INF/pages/footer.jsp create mode 100644 src/main/webapp/WEB-INF/pages/header.jsp diff --git a/src/main/java/fr/plil/sio/web/mvc/ApplicationSecurityConfiguration.java b/src/main/java/fr/plil/sio/web/mvc/ApplicationSecurityConfiguration.java index b53f01e..7413bb9 100644 --- a/src/main/java/fr/plil/sio/web/mvc/ApplicationSecurityConfiguration.java +++ b/src/main/java/fr/plil/sio/web/mvc/ApplicationSecurityConfiguration.java @@ -27,6 +27,7 @@ public class ApplicationSecurityConfiguration extends WebSecurityConfigurerAdapt protected void configure(HttpSecurity http) throws Exception { http .authorizeRequests() + .antMatchers("/webjars/**").permitAll() .anyRequest().authenticated() .and() .formLogin() diff --git a/src/main/webapp/WEB-INF/pages/footer.jsp b/src/main/webapp/WEB-INF/pages/footer.jsp new file mode 100644 index 0000000..5d9cb1b --- /dev/null +++ b/src/main/webapp/WEB-INF/pages/footer.jsp @@ -0,0 +1,4 @@ + + + + diff --git a/src/main/webapp/WEB-INF/pages/header.jsp b/src/main/webapp/WEB-INF/pages/header.jsp new file mode 100644 index 0000000..51d13a8 --- /dev/null +++ b/src/main/webapp/WEB-INF/pages/header.jsp @@ -0,0 +1,10 @@ + + + + + + + Title + + + diff --git a/src/main/webapp/WEB-INF/pages/login.jsp b/src/main/webapp/WEB-INF/pages/login.jsp index 45aa0f0..0f8fd46 100644 --- a/src/main/webapp/WEB-INF/pages/login.jsp +++ b/src/main/webapp/WEB-INF/pages/login.jsp @@ -1,10 +1,6 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ page contentType="text/html;charset=UTF-8" language="java" %> - - - Title - - +
@@ -21,5 +17,4 @@ value="${_csrf.token}"/>
- - + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/pages/newUser.jsp b/src/main/webapp/WEB-INF/pages/newUser.jsp index a90320f..d8444dc 100644 --- a/src/main/webapp/WEB-INF/pages/newUser.jsp +++ b/src/main/webapp/WEB-INF/pages/newUser.jsp @@ -1,16 +1,7 @@ <%@ page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib uri="http://www.springframework.org/tags/form" prefix="form" %> <%@ taglib uri="http://www.springframework.org/tags" prefix="spring" %> - - - - - - - <spring:message code="new.user.page.title"/> - - +

@@ -32,5 +23,4 @@
- - + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/pages/viewUsers.jsp b/src/main/webapp/WEB-INF/pages/viewUsers.jsp index 97ed3c7..b2c714e 100644 --- a/src/main/webapp/WEB-INF/pages/viewUsers.jsp +++ b/src/main/webapp/WEB-INF/pages/viewUsers.jsp @@ -1,16 +1,7 @@ <%@ page contentType="text/html" pageEncoding="UTF-8" %> <%@ taglib uri="http://www.springframework.org/tags" prefix="spring" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> - - - - - - - <spring:message code="view.users.page.title"/> - - +

${userSession.username} !

@@ -35,5 +26,4 @@
    • - - + \ No newline at end of file -- libgit2 0.21.2