From 2ebf9bea07e74e310b75f79c221c420e604b85c8 Mon Sep 17 00:00:00 2001 From: DOHA Date: Wed, 1 Apr 2015 21:21:46 +0200 Subject: [PATCH] update ui --- .../src/main/webapp/WEB-INF/view/admin.jsp | 43 ++--- .../src/main/webapp/WEB-INF/view/badUser.jsp | 22 +-- .../webapp/WEB-INF/view/changePassword.jsp | 72 +++++++++ .../src/main/webapp/WEB-INF/view/console.jsp | 51 +++--- .../main/webapp/WEB-INF/view/emailError.jsp | 18 +-- .../webapp/WEB-INF/view/expiredAccount.jsp | 13 +- .../webapp/WEB-INF/view/forgetPassword.jsp | 33 ++-- .../src/main/webapp/WEB-INF/view/home.jsp | 27 ++-- .../src/main/webapp/WEB-INF/view/homepage.jsp | 47 +++--- .../webapp/WEB-INF/view/invalidSession.jsp | 20 ++- .../src/main/webapp/WEB-INF/view/login.jsp | 152 +++++++++--------- .../src/main/webapp/WEB-INF/view/logout.jsp | 31 ++-- .../main/webapp/WEB-INF/view/registration.jsp | 14 ++ .../WEB-INF/view/regitrationConfirm.jsp | 11 +- .../webapp/WEB-INF/view/updatePassword.jsp | 27 ++-- .../src/main/webapp/resources/pwstrength.js | 4 + 16 files changed, 342 insertions(+), 243 deletions(-) create mode 100644 spring-security-login-and-registration/src/main/webapp/WEB-INF/view/changePassword.jsp create mode 100644 spring-security-login-and-registration/src/main/webapp/resources/pwstrength.js diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/admin.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/admin.jsp index b31fbaef45..db3d8f20ba 100644 --- a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/admin.jsp +++ b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/admin.jsp @@ -1,29 +1,34 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <%@ taglib prefix="sec" - uri="http://www.springframework.org/security/tags"%> + uri="http://www.springframework.org/security/tags"%> <%@taglib uri="http://www.springframework.org/tags" prefix="spring"%> -" rel="stylesheet"> + <spring:message code="label.pages.home.title"></spring:message> -
-
- - - - -

- -

- - "> "> -
-
+ + +
+ + + + +

+ +

+ +
- + \ No newline at end of file diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/badUser.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/badUser.jsp index e090c55e29..c2ad64ec6a 100644 --- a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/badUser.jsp +++ b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/badUser.jsp @@ -1,38 +1,37 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib prefix="sec" - uri="http://www.springframework.org/security/tags"%> + uri="http://www.springframework.org/security/tags"%> <%@taglib uri="http://www.springframework.org/tags" prefix="spring"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%> <%@ page session="true"%> -" rel="stylesheet"> - <spring:message +<link rel="stylesheet" href="https://maxcdn.bootstrapcdn.com/bootstrap/3.3.2/css/bootstrap.min.css"> + <title><spring:message code="label.badUser.title"></spring:message> -

-
- ${param.message} +
+

+ ${param.message}


-">">

${label.form.resendRegistrationToken}

- +
diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/changePassword.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/changePassword.jsp new file mode 100644 index 0000000000..21f4e52c23 --- /dev/null +++ b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/changePassword.jsp @@ -0,0 +1,72 @@ + +<%@ page contentType="text/html;charset=UTF-8" language="java"%> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> +<%@ taglib prefix="sec" + uri="http://www.springframework.org/security/tags"%> +<%@ page session="false"%> + + + + +<spring:message code="message.changePassword"></spring:message> + + + +
+
+ +

+
+
+ + + + +

+ + + +

+ + + + +

+ +
+ +
+
+ + + + + \ No newline at end of file diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/console.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/console.jsp index cd3146914d..1cf661af87 100644 --- a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/console.jsp +++ b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/console.jsp @@ -1,29 +1,42 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <%@ taglib prefix="sec" - uri="http://www.springframework.org/security/tags"%> + uri="http://www.springframework.org/security/tags"%> <%@taglib uri="http://www.springframework.org/tags" prefix="spring"%> -" rel="stylesheet"> + -
-
-

This is the landing page for the admin

- - This text is only visible to a user -
- - - This text is only visible to an admin -
- - "> "> -
-
+ + +
+ +
+${param.message} +
+ +

This is the landing page for the admin

+ + This text is only visible to a user +
+ + + This text is only visible to an admin +
+ + "> + + "> +
\ No newline at end of file diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/emailError.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/emailError.jsp index ca94dbdfb0..ed25d1f2cd 100644 --- a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/emailError.jsp +++ b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/emailError.jsp @@ -2,18 +2,16 @@ <%@taglib uri="http://www.springframework.org/tags" prefix="spring"%> -" rel="stylesheet"> + <spring:message code="label.pages.home.title"></spring:message> -
-
-

- -

- -
-
+
+

+ +

+ +
- + \ No newline at end of file diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/expiredAccount.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/expiredAccount.jsp index 6d45aa3da4..e829daaa61 100644 --- a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/expiredAccount.jsp +++ b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/expiredAccount.jsp @@ -1,6 +1,6 @@ <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %> <%@ taglib prefix="sec" - uri="http://www.springframework.org/security/tags"%> + uri="http://www.springframework.org/security/tags"%> <%@taglib uri="http://www.springframework.org/tags" prefix="spring"%> <%@ taglib uri="http://java.sun.com/jsp/jstl/fmt" prefix="fmt"%> @@ -8,16 +8,17 @@ -" rel="stylesheet"> - <spring:message code="label.pages.home.title"></spring:message> + + <spring:message code="label.pages.home.title"></spring:message> -

+
+


-">"> - +
diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/forgetPassword.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/forgetPassword.jsp index 7e7ee0c01f..cff325846d 100644 --- a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/forgetPassword.jsp +++ b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/forgetPassword.jsp @@ -4,41 +4,30 @@ <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form"%> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%> <%@ taglib prefix="sec" - uri="http://www.springframework.org/security/tags"%> + uri="http://www.springframework.org/security/tags"%> <%@ page session="false"%> -" rel="stylesheet"> + <spring:message code="message.resetPassword"></spring:message>
-
-

- -

-
-
- - - - - - - +

+
+
+ + +

-"> -
-"> +"> +

+">
-
- + @@ -68,42 +72,38 @@ ${param.message}
-
-
-

- -

- - | -
- - - - - - - - - - - - -
/>
+
+
+

+ +

+ + | +

+ + + + + +

+ + + +

+ /> - -
Current Locale : ${pageContext.response.locale}
"> -


- "> +
Current Locale : ${pageContext.response.locale}

+ "> +

+ "> -
-
+
+
\ No newline at end of file diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/logout.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/logout.jsp index b83c558577..284cdc6621 100644 --- a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/logout.jsp +++ b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/logout.jsp @@ -1,32 +1,31 @@ <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core"%> <%@ taglib prefix="sec" - uri="http://www.springframework.org/security/tags"%> + uri="http://www.springframework.org/security/tags"%> <%@taglib uri="http://www.springframework.org/tags" prefix="spring"%> -" rel="stylesheet"> + -
- -
+

+ +

<spring:message code="label.pages.home.title"></spring:message> -
-
- -
- -
- - "> -
-
+
+ + +

+ +

+ + "> +
\ No newline at end of file diff --git a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/registration.jsp b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/registration.jsp index 34f51c2881..52f61ff93b 100644 --- a/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/registration.jsp +++ b/spring-security-login-and-registration/src/main/webapp/WEB-INF/view/registration.jsp @@ -6,7 +6,13 @@ + + <spring:message code="label.form.title"></spring:message> @@ -57,6 +63,14 @@