diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/forgotpwd/email.ftl b/maxkey-web-maxkey/src/main/resources/templates/views/forgotpwd/email.ftl new file mode 100644 index 000000000..3ccb8b3e6 --- /dev/null +++ b/maxkey-web-maxkey/src/main/resources/templates/views/forgotpwd/email.ftl @@ -0,0 +1,11 @@ +
+ <#if 0 == emailsend> + user email ${email} not find,
+ + + <#if 1 == emailsend> + please check you email ${email},to Reset Password. + +
+ + \ No newline at end of file diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/forgotpwd/email.jsp b/maxkey-web-maxkey/src/main/resources/templates/views/forgotpwd/email.jsp deleted file mode 100644 index 823d70ed0..000000000 --- a/maxkey-web-maxkey/src/main/resources/templates/views/forgotpwd/email.jsp +++ /dev/null @@ -1,17 +0,0 @@ -<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="s" uri="http://sso.maxkey.org/tags" %> - -
- - user email ${email} not find,
- - - - please check you email ${email},to Reset Password. - -
- - \ No newline at end of file diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/forgotpwd/findpwd.ftl b/maxkey-web-maxkey/src/main/resources/templates/views/forgotpwd/findpwd.ftl new file mode 100644 index 000000000..2045cb55b --- /dev/null +++ b/maxkey-web-maxkey/src/main/resources/templates/views/forgotpwd/findpwd.ftl @@ -0,0 +1,24 @@ +
+ + + + + +
+ + +
+ + + + + + + + + + +
<@locale code="forgotpwd.email"/>
"/>
+
+
+
\ No newline at end of file diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/forgotpwd/findpwd.jsp b/maxkey-web-maxkey/src/main/resources/templates/views/forgotpwd/findpwd.jsp deleted file mode 100644 index d380cc2d9..000000000 --- a/maxkey-web-maxkey/src/main/resources/templates/views/forgotpwd/findpwd.jsp +++ /dev/null @@ -1,30 +0,0 @@ -<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="s" uri="http://sso.maxkey.org/tags" %> - -
- - - - - -
- - -
- - - - - - - - - - -
"/>
-
-
-
\ No newline at end of file diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/forgotpwd/pwdreseted.ftl b/maxkey-web-maxkey/src/main/resources/templates/views/forgotpwd/pwdreseted.ftl new file mode 100644 index 000000000..fbd1f6f3d --- /dev/null +++ b/maxkey-web-maxkey/src/main/resources/templates/views/forgotpwd/pwdreseted.ftl @@ -0,0 +1,13 @@ + +
+ <#if 0 == pwdreseted> + password not eq the confirm password,
+ + + <#if 1 == pwdreseted> + Reset Password successful,click here login. + + <#if 2 == pwdreseted> + url expired. + +
\ No newline at end of file diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/forgotpwd/pwdreseted.jsp b/maxkey-web-maxkey/src/main/resources/templates/views/forgotpwd/pwdreseted.jsp deleted file mode 100644 index 0377d22c5..000000000 --- a/maxkey-web-maxkey/src/main/resources/templates/views/forgotpwd/pwdreseted.jsp +++ /dev/null @@ -1,18 +0,0 @@ -<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="s" uri="http://sso.maxkey.org/tags" %> - -
- - password not eq the confirm password,
- - - - Reset Password successful,click here login. - - - url expired. - -
\ No newline at end of file diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/forgotpwd/resetpwd.jsp b/maxkey-web-maxkey/src/main/resources/templates/views/forgotpwd/resetpwd.ftl similarity index 100% rename from maxkey-web-maxkey/src/main/resources/templates/views/forgotpwd/resetpwd.jsp rename to maxkey-web-maxkey/src/main/resources/templates/views/forgotpwd/resetpwd.ftl diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/main/appConfigList.jsp b/maxkey-web-maxkey/src/main/resources/templates/views/main/appConfigList.ftl similarity index 84% rename from maxkey-web-maxkey/src/main/resources/templates/views/main/appConfigList.jsp rename to maxkey-web-maxkey/src/main/resources/templates/views/main/appConfigList.ftl index 6cdc088ab..d90eb9856 100644 --- a/maxkey-web-maxkey/src/main/resources/templates/views/main/appConfigList.jsp +++ b/maxkey-web-maxkey/src/main/resources/templates/views/main/appConfigList.ftl @@ -1,11 +1,3 @@ -<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%> -<%@ page import="org.maxkey.domain.*"%> -<%@ page import="org.maxkey.web.*"%> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> -<%@ taglib prefix="s" uri="http://sso.maxkey.org/tags" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> <%if(WebContext.getUserInfo().getGridList()==0) {%> - +
diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/main/appProtectedConfig.ftl b/maxkey-web-maxkey/src/main/resources/templates/views/main/appProtectedConfig.ftl new file mode 100644 index 000000000..b2db9aabc --- /dev/null +++ b/maxkey-web-maxkey/src/main/resources/templates/views/main/appProtectedConfig.ftl @@ -0,0 +1,34 @@ + + + +
+ + + + + + + + + + + + + + + + + + + + + + +
uid
appId
<@locale code="access.security.applogin.protection" />
"/>
+
diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/main/appProtectedConfig.jsp b/maxkey-web-maxkey/src/main/resources/templates/views/main/appProtectedConfig.jsp deleted file mode 100644 index 3fe4be52a..000000000 --- a/maxkey-web-maxkey/src/main/resources/templates/views/main/appProtectedConfig.jsp +++ /dev/null @@ -1,41 +0,0 @@ -<%@ page contentType="text/html; charset=UTF-8" import="java.util.Map,java.util.LinkedHashMap" %> -<%@ page import="org.maxkey.web.*"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="s" uri="http://sso.maxkey.org/tags" %> - - - - - -
- - - - - - - - - - - - - - - - - - - - - - -
uid
appId
"/>
-
diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/main/appUserConfig.jsp b/maxkey-web-maxkey/src/main/resources/templates/views/main/appUserConfig.ftl similarity index 51% rename from maxkey-web-maxkey/src/main/resources/templates/views/main/appUserConfig.jsp rename to maxkey-web-maxkey/src/main/resources/templates/views/main/appUserConfig.ftl index ad422e163..2f7712b61 100644 --- a/maxkey-web-maxkey/src/main/resources/templates/views/main/appUserConfig.jsp +++ b/maxkey-web-maxkey/src/main/resources/templates/views/main/appUserConfig.ftl @@ -1,27 +1,20 @@ -<%@ page contentType="text/html; charset=UTF-8" import="java.util.Map,java.util.LinkedHashMap" %> -<%@ page import="org.maxkey.web.*"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="s" uri="http://sso.maxkey.org/tags" %> - - -
+ - style="display:none"> - + style="display:none"> + - style="display:none" > - + style="display:none" > + @@ -34,7 +27,7 @@ - +
<@locale code="userinfo.appaccouts.relatedUsername" />
<@locale code="userinfo.appaccouts.relatedPassword" />
"/>"/>
diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/registration/activated.ftl b/maxkey-web-maxkey/src/main/resources/templates/views/registration/activated.ftl new file mode 100644 index 000000000..167d24803 --- /dev/null +++ b/maxkey-web-maxkey/src/main/resources/templates/views/registration/activated.ftl @@ -0,0 +1,29 @@ + + + + + + My JSP 'activated.jsp' starting page + + + + + + + + + + +
+ <#if 0 == activate> + url expired. + + <#if 1 == activate> + activate success, + + <@locale code="login.button.login"/> + + +
+ + diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/registration/activated.jsp b/maxkey-web-maxkey/src/main/resources/templates/views/registration/activated.jsp deleted file mode 100644 index d689e8cc7..000000000 --- a/maxkey-web-maxkey/src/main/resources/templates/views/registration/activated.jsp +++ /dev/null @@ -1,43 +0,0 @@ -<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="s" uri="http://sso.maxkey.org/tags" %> - -<% -String path = request.getContextPath(); -String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; -%> - - - - - - - My JSP 'activated.jsp' starting page - - - - - - - - - - - -
- - url expired. - - - activate success, - - - - -
- - diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/registration/initPassword.jsp b/maxkey-web-maxkey/src/main/resources/templates/views/registration/initPassword.ftl similarity index 52% rename from maxkey-web-maxkey/src/main/resources/templates/views/registration/initPassword.jsp rename to maxkey-web-maxkey/src/main/resources/templates/views/registration/initPassword.ftl index ec9e7c774..1c7c376f1 100644 --- a/maxkey-web-maxkey/src/main/resources/templates/views/registration/initPassword.jsp +++ b/maxkey-web-maxkey/src/main/resources/templates/views/registration/initPassword.ftl @@ -1,18 +1,7 @@ -<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="s" uri="http://sso.maxkey.org/tags" %> - -<% -String path = request.getContextPath(); -String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; -%> - - + My JSP 'activated.jsp' starting page @@ -21,57 +10,53 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request. - -
- + <#if null != model>
-
+ - + - + - + - + - + - + - + - + - +
<@locale code="register.lastname"/> ${model.lastName}
<@locale code="register.firstname"/> ${model.firstName}
<@locale code="register.workemail"/> ${model.workEmail}
<@locale code="register.company"/> ${model.company}
<@locale code="register.workphone"/> ${model.workPhone}
<@locale code="register.password"/>
<@locale code="register.confirmpassword"/>
<@locale code="register.users"/>
"/>"/>
@@ -79,10 +64,10 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
- - + + <#if null == model> url expired. - +
diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/registration/register.jsp b/maxkey-web-maxkey/src/main/resources/templates/views/registration/register.ftl similarity index 60% rename from maxkey-web-maxkey/src/main/resources/templates/views/registration/register.jsp rename to maxkey-web-maxkey/src/main/resources/templates/views/registration/register.ftl index ec6a74b70..46576854f 100644 --- a/maxkey-web-maxkey/src/main/resources/templates/views/registration/register.jsp +++ b/maxkey-web-maxkey/src/main/resources/templates/views/registration/register.ftl @@ -1,16 +1,7 @@ -<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%> -<%@ taglib prefix="s" uri="http://sso.maxkey.org/tags" %> -<%@ taglib prefix="fmt" uri="http://java.sun.com/jsp/jstl/fmt"%> - -<% -String path = request.getContextPath(); -String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; -%> - - + My JSP 'register.jsp' starting page @@ -19,9 +10,7 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request. - + @@ -33,35 +22,35 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request. 		- + - + - + - + - + - + - + - +
<@locale code="register.lastname"/>
<@locale code="register.firstname"/>
<@locale code="register.workemail"/>
<@locale code="register.company"/>
<@locale code="register.workphone"/>
<@locale code="register.users"/>
"/>"/>
diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/registration/registered.ftl b/maxkey-web-maxkey/src/main/resources/templates/views/registration/registered.ftl new file mode 100644 index 000000000..c14922a37 --- /dev/null +++ b/maxkey-web-maxkey/src/main/resources/templates/views/registration/registered.ftl @@ -0,0 +1,30 @@ + + + + + + Registered + + + + + + + + + + + <#if 2==registered> + company ${company} registered,please change company name.
+ + + + <#if 1==registered> + please activate by you email . + + + <#if 0==registered> + please activate by you email . + + + diff --git a/maxkey-web-maxkey/src/main/resources/templates/views/registration/registered.jsp b/maxkey-web-maxkey/src/main/resources/templates/views/registration/registered.jsp deleted file mode 100644 index d287807cb..000000000 --- a/maxkey-web-maxkey/src/main/resources/templates/views/registration/registered.jsp +++ /dev/null @@ -1,41 +0,0 @@ -<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ taglib prefix="s" uri="http://sso.maxkey.org/tags" %> - -<% -String path = request.getContextPath(); -String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; -%> - - - - - - - Registered - - - - - - - - - - - - company ${company} registered,please change company name.
- - - - - please activate by you email . - - - - please activate by you email . - - -