shimingxy il y a 5 ans
Parent
commit
6cf2b478ed
17 fichiers modifiés avec 173 ajouts et 263 suppressions
  1. 11 0
      maxkey-web-maxkey/src/main/resources/templates/views/forgotpwd/email.ftl
  2. 0 17
      maxkey-web-maxkey/src/main/resources/templates/views/forgotpwd/email.jsp
  3. 24 0
      maxkey-web-maxkey/src/main/resources/templates/views/forgotpwd/findpwd.ftl
  4. 0 30
      maxkey-web-maxkey/src/main/resources/templates/views/forgotpwd/findpwd.jsp
  5. 13 0
      maxkey-web-maxkey/src/main/resources/templates/views/forgotpwd/pwdreseted.ftl
  6. 0 18
      maxkey-web-maxkey/src/main/resources/templates/views/forgotpwd/pwdreseted.jsp
  7. 0 0
      maxkey-web-maxkey/src/main/resources/templates/views/forgotpwd/resetpwd.ftl
  8. 1 9
      maxkey-web-maxkey/src/main/resources/templates/views/main/appConfigList.ftl
  9. 34 0
      maxkey-web-maxkey/src/main/resources/templates/views/main/appProtectedConfig.ftl
  10. 0 41
      maxkey-web-maxkey/src/main/resources/templates/views/main/appProtectedConfig.jsp
  11. 6 13
      maxkey-web-maxkey/src/main/resources/templates/views/main/appUserConfig.ftl
  12. 29 0
      maxkey-web-maxkey/src/main/resources/templates/views/registration/activated.ftl
  13. 0 43
      maxkey-web-maxkey/src/main/resources/templates/views/registration/activated.jsp
  14. 15 30
      maxkey-web-maxkey/src/main/resources/templates/views/registration/initPassword.ftl
  15. 10 21
      maxkey-web-maxkey/src/main/resources/templates/views/registration/register.ftl
  16. 30 0
      maxkey-web-maxkey/src/main/resources/templates/views/registration/registered.ftl
  17. 0 41
      maxkey-web-maxkey/src/main/resources/templates/views/registration/registered.jsp

+ 11 - 0
maxkey-web-maxkey/src/main/resources/templates/views/forgotpwd/email.ftl

@@ -0,0 +1,11 @@
+<div class="container">	
+  <#if 0 == emailsend>
+  	user email ${email} not find,<br>
+  	<input type="button"  class="button"  value="后退"  onclick="javascript:history.go(-1);"> 
+  </#if>
+  <#if 1 == emailsend>
+  	please check you email ${email},to Reset Password.
+  </#if>
+</div>
+  
+  

+ 0 - 17
maxkey-web-maxkey/src/main/resources/templates/views/forgotpwd/email.jsp

@@ -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" %> 
-
-<div class="container">	
-  <c:if test="${0 == emailsend}">
-  	user email ${email} not find,<br>
-  	<input type="button"  class="button"  value="后退"  onclick="javascript:history.go(-1);"> 
-  </c:if>
-  <c:if test="${1 == emailsend}">
-  	please check you email ${email},to Reset Password.
-  </c:if>
-</div>
-  
-  

+ 24 - 0
maxkey-web-maxkey/src/main/resources/templates/views/forgotpwd/findpwd.ftl

@@ -0,0 +1,24 @@
+<div class="container">	
+	<table border="0"  style="width:100%;">
+		<tr>
+			<td width="630px">
+				
+			</td>
+			<td>
+				<form action="<@base/>/forgotpassword/email" method="post">
+					<table  class="datatable">
+						<tr>
+							<td><@locale code="forgotpwd.email"/></td>
+							<td><input type="email" id="email" name="email" class="int required" title="" value=""/></td>
+						</tr>
+						
+						<tr>
+							<td  colspan="2"><input id="forgotpwdBtn" class="button" type="submit" value="<@locale code="button.text.enable" />"/></td>
+						</tr>
+						
+					</table>
+				</form>
+			</td>
+		</tr>
+	</table>
+</div>

+ 0 - 30
maxkey-web-maxkey/src/main/resources/templates/views/forgotpwd/findpwd.jsp

@@ -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" %> 
-
-<div class="container">	
-	<table border="0"  style="width:100%;">
-		<tr>
-			<td width="630px">
-				
-			</td>
-			<td>
-				<form action="<s:Base/>/forgotpassword/email" method="post">
-					<table  class="datatable">
-						<tr>
-							<td><s:Locale code="forgotpwd.email"/></td>
-							<td><input type="email" id="email" name="email" class="int required" title="" value=""/></td>
-						</tr>
-						
-						<tr>
-							<td  colspan="2"><input id="forgotpwdBtn" class="button" type="submit" value="<s:Locale code="button.text.enable" />"/></td>
-						</tr>
-						
-					</table>
-				</form>
-			</td>
-		</tr>
-	</table>
-</div>

+ 13 - 0
maxkey-web-maxkey/src/main/resources/templates/views/forgotpwd/pwdreseted.ftl

@@ -0,0 +1,13 @@
+
+<div class="container">	
+  <#if 0 == pwdreseted>
+  	password not eq the confirm password,<br>
+  	<input type="button"  class="button"  value="后退"  onclick="javascript:history.go(-1);"> 
+  </#if>
+  <#if 1 == pwdreseted>
+  	Reset Password successful,<a href="<s:Base/>/login">click here</a> login.
+  </#if>
+  <#if 2 == pwdreseted>
+  	url expired.
+  </#if>
+</div>

+ 0 - 18
maxkey-web-maxkey/src/main/resources/templates/views/forgotpwd/pwdreseted.jsp

@@ -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" %> 
-
-<div class="container">	
-  <c:if test="${0 == pwdreseted}">
-  	password not eq the confirm password,<br>
-  	<input type="button"  class="button"  value="后退"  onclick="javascript:history.go(-1);"> 
-  </c:if>
-  <c:if test="${1 == pwdreseted}">
-  	Reset Password successful,<a href="<s:Base/>/login">click here</a> login.
-  </c:if>
-  <c:if test="${2 == pwdreseted}">
-  	url expired.
-  </c:if>
-</div>

+ 0 - 0
maxkey-web-maxkey/src/main/resources/templates/views/forgotpwd/resetpwd.jsp → maxkey-web-maxkey/src/main/resources/templates/views/forgotpwd/resetpwd.ftl


+ 1 - 9
maxkey-web-maxkey/src/main/resources/templates/views/main/appConfigList.jsp → 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" %>
 <script type="text/javascript">	
 $(function () {
 	$(".configUser").on("click",function(){
@@ -19,7 +11,7 @@ $(function () {
 </script>
 <%if(WebContext.getUserInfo().getGridList()==0) {%>
 <table class="datatable">
-	<c:forEach begin="1" end="${(fn:length(appList)+4)/5}" var="num">
+	<c:forEach begin="1" end="${(length(appList)+4)/5}" var="num">
 		<tr>
 			<c:forEach items="${appList}" var="app" begin="${(num-1)*5}" end="${5*num-1}">
 			<td align="left" nowrap  style="width:20%">

+ 34 - 0
maxkey-web-maxkey/src/main/resources/templates/views/main/appProtectedConfig.ftl

@@ -0,0 +1,34 @@
+<script type="text/javascript">
+
+
+</script>
+	 
+	     <!-- content -->  
+	<form id="actionForm" name="credentialsubmit" action="<@base/>/appProtectedConfig" method="post" type="type">
+		<input type="hidden" id="protocol" name="protocol" value="${protocol}" />
+		<input type="hidden" id="credential" name="credential" value="${credential}" />
+		<table width="420px">
+			<tr style="display:none">
+				<td>uid</td>
+				<td><input type="text" id="uid" name="uid" value="${uid}" /></td>
+			</tr>
+			<tr style="display:none">
+				<td>appId</td>
+				<td><input type="text" id="appId" name="appId" value="${appId}" /></td>
+			</tr>
+			<tr>
+				<td  width="120px"><@locale code="access.security.applogin.protection" /> </td>
+				<td><select  id="protectedappId" name="protectedappId" >
+						<option value="YES" <#if true==protectedappId>selected</#if> ><s:Locale code="common.text.status.3" /></option>
+						<option value="NO"  <#if false==protectedappId>selected</#if>><s:Locale code="common.text.status.4" /></option>
+					</select></td>
+			</tr>
+			<tr >
+				<td><s:Locale code="userinfo.password" /></td>
+				<td><input type="password" id="password" name="password"  /></td>
+			</tr>
+			<tr>
+				<td colspan="2"><input class="button" type="submit" style="width: 400px" id="credentialsubmitbutton"value="<@locale code="button.text.save" />"/></td>
+			</tr>
+		</table>
+	</form>

+ 0 - 41
maxkey-web-maxkey/src/main/resources/templates/views/main/appProtectedConfig.jsp

@@ -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" %>
-
-
-<script type="text/javascript">
-
-
-</script>
-	 
-	     <!-- content -->  
-	<form id="actionForm" name="credentialsubmit" action="<s:Base/>/appProtectedConfig" method="post" type="type">
-		<input type="hidden" id="protocol" name="protocol" value="${protocol}" />
-		<input type="hidden" id="credential" name="credential" value="${credential}" />
-		<table width="420px">
-			<tr style="display:none">
-				<td>uid</td>
-				<td><input type="text" id="uid" name="uid" value="${uid}" /></td>
-			</tr>
-			<tr style="display:none">
-				<td>appId</td>
-				<td><input type="text" id="appId" name="appId" value="${appId}" /></td>
-			</tr>
-			<tr>
-				<td  width="120px"><s:Locale code="access.security.applogin.protection" /> </td>
-				<td><select  id="protectedappId" name="protectedappId" >
-						<option value="YES" <c:if test="${true==protectedappId}">selected</c:if> ><s:Locale code="common.text.status.3" /></option>
-						<option value="NO"  <c:if test="${false==protectedappId}">selected</c:if>><s:Locale code="common.text.status.4" /></option>
-					</select></td>
-			</tr>
-			<tr >
-				<td><s:Locale code="userinfo.password" /></td>
-				<td><input type="password" id="password" name="password"  /></td>
-			</tr>
-			<tr>
-				<td colspan="2"><input class="button" type="submit" style="width: 400px" id="credentialsubmitbutton"value="<s:Locale code="button.text.save" />"/></td>
-			</tr>
-		</table>
-	</form>

+ 6 - 13
maxkey-web-maxkey/src/main/resources/templates/views/main/appUserConfig.jsp → 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" %>
-
-
 <script type="text/javascript">
 
 
 </script>
 	 
 	     <!-- content -->  
-	<form id="actionForm" name="credentialsubmit" action="<s:Base/>/appUserConfig" method="post">
+	<form id="actionForm" name="credentialsubmit" action="<@base/>/appUserConfig" method="post">
 		<input type="hidden" id="protocol" name="protocol" value="${protocol}" />
 		<input type="hidden" id="credential" name="credential" value="${credential}" />
 		<table width="420px">
 			
-			<tr <c:if test="${false==username}">style="display:none"</c:if>>
-				<td><s:Locale code="userinfo.appaccouts.relatedUsername" /></td>
+			<tr <#if false==username>style="display:none"</#if>>
+				<td><@locale code="userinfo.appaccouts.relatedUsername" /></td>
 				<td><input type="text" id="identity_username" name="identity_username" value="${identity_username}" /></td>
 			</tr>
-			<tr <c:if test="${false==password}"> style="display:none"</c:if> >
-				<td><s:Locale code="userinfo.appaccouts.relatedPassword" /></td>
+			<tr <#if false==password> style="display:none"</#if> >
+				<td><@locale code="userinfo.appaccouts.relatedPassword" /></td>
 				<td><input type="password" id="identity_password" name="identity_password" value="${identity_password}" /></td>
 			</tr>
 			
@@ -34,7 +27,7 @@
 				<td><input type="text" id="appId" name="appId" value="${appId}" /></td>
 			</tr>
 			<tr>
-				<td colspan="2"><input class="button" type="submit" style="width: 400px" id="credentialsubmitbutton"value="<s:Locale code="button.text.save" />"/></td>
+				<td colspan="2"><input class="button" type="submit" style="width: 400px" id="credentialsubmitbutton"value="<@locale code="button.text.save" />"/></td>
 			</tr>
 		</table>
 	</form> 

+ 29 - 0
maxkey-web-maxkey/src/main/resources/templates/views/registration/activated.ftl

@@ -0,0 +1,29 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
+<html>
+  <head>
+    <base href="<@base/>">
+    
+    <title>My JSP 'activated.jsp' starting page</title>
+    
+	<meta http-equiv="pragma" content="no-cache">
+	<meta http-equiv="cache-control" content="no-cache">
+	<meta http-equiv="expires" content="0">    
+	<meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
+	<meta http-equiv="description" content="This is my page">
+
+  </head>
+  
+  <body>
+<div class="container">
+ 	 <#if 0 == activate>
+		url expired.
+	  </#if>
+    <#if 1 == activate>
+    	activate success,
+    	<a href='<@base url="/"/>'>
+			<@locale code="login.button.login"/>
+		</a>
+    </#if>  
+</div>
+  </body>
+</html>

+ 0 - 43
maxkey-web-maxkey/src/main/resources/templates/views/registration/activated.jsp

@@ -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+"/";
-%>
-
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
-<html>
-  <head>
-    <base href="<%=basePath%>">
-    
-    <title>My JSP 'activated.jsp' starting page</title>
-    
-	<meta http-equiv="pragma" content="no-cache">
-	<meta http-equiv="cache-control" content="no-cache">
-	<meta http-equiv="expires" content="0">    
-	<meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
-	<meta http-equiv="description" content="This is my page">
-	<!--
-	<link rel="stylesheet" type="text/css" href="styles.css">
-	-->
-
-  </head>
-  
-  <body>
-<div class="container">
- 	 <c:if test="${0 == activate}">
-		url expired.
-	  </c:if>
-    <c:if test="${1 == activate}">
-    	activate success,
-    	<a href="<c:url value='/'/>">
-			<s:Locale code="login.button.login"/>
-		</a>
-    </c:if>  
-</div>
-  </body>
-</html>

+ 15 - 30
maxkey-web-maxkey/src/main/resources/templates/views/registration/initPassword.jsp → 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+"/";
-%>
-
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
   <head>
-    <base href="<%=basePath%>">
+     <base href="<@base/>">
     
     <title>My JSP 'activated.jsp' starting page</title>
     
@@ -21,57 +10,53 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
 	<meta http-equiv="expires" content="0">    
 	<meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
 	<meta http-equiv="description" content="This is my page">
-	<!--
-	<link rel="stylesheet" type="text/css" href="styles.css">
-	-->
-
   </head>
   
   <body>
 <div class="container">	
-  <c:if test="${null != model}">
+  <#if null != model>
 	<table border="0"  style="width:100%;">
 		<tr>
 			<td width="630px">
 				
 			</td>
 			<td>
-				<form action="<s:Base />/registration/activate/${model.id}" method="post">
+				<form action="<@base />/registration/activate/${model.id}" method="post">
 					<table  class="datatable">
 						<tr>
-							<td><s:Locale code="register.lastname"/></td>
+							<td><@locale code="register.lastname"/></td>
 							<td>${model.lastName}</td>
 						</tr>
 						<tr>
-							<td><s:Locale code="register.firstname"/></td>
+							<td><@locale code="register.firstname"/></td>
 							<td>${model.firstName}</td>
 						</tr>
 						<tr>
-							<td><s:Locale code="register.workemail"/></td>
+							<td><@locale code="register.workemail"/></td>
 							<td>${model.workEmail}</td>
 						</tr>
 						<tr>
-							<td><s:Locale code="register.company"/></td>
+							<td><@locale code="register.company"/></td>
 							<td>${model.company}</td>
 						</tr>
 						<tr>
-							<td><s:Locale code="register.workphone"/></td>
+							<td><@locale code="register.workphone"/></td>
 							<td>${model.workPhone}</td>
 						</tr>
 						<tr>
-							<td><s:Locale code="register.password"/></td>
+							<td><@locale code="register.password"/></td>
 							<td><input type='password' id="password" name="password" value="" /></td>
 						</tr>
 						<tr>
-							<td><s:Locale code="register.confirmpassword"/></td>
+							<td><@locale code="register.confirmpassword"/></td>
 							<td><input type='password' id="confirmpassword" name="confirmpassword" value="" /></td>
 						</tr>
 						<tr style="display:none">
-							<td><s:Locale code="register.users"/></td>
+							<td><@locale code="register.users"/></td>
 							<td><input type='text' id="users" name="users" value="0" /></td>
 						</tr>
 						<tr>
-							<td  colspan="2"><input id="registerBtn" class="button" type="submit" value="<s:Locale code="button.text.enable" />"/></td>
+							<td  colspan="2"><input id="registerBtn" class="button" type="submit" value="<@locale code="button.text.enable" />"/></td>
 						</tr>
 						
 					</table>
@@ -79,10 +64,10 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
 			</td>
 		</tr>
 	</table>
-	  </c:if>
-    <c:if test="${null == model}">
+	  </#if>
+    <#if null == model>
     	url expired.
-    </c:if>  
+    </#if>  
 </div>
   </body>
 </html>

+ 10 - 21
maxkey-web-maxkey/src/main/resources/templates/views/registration/register.jsp → 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+"/";
-%>
-
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN">
 <html>
   <head>
-    <base href="<%=basePath%>">
+     <base href="<@base/>">
     
     <title>My JSP 'register.jsp' starting page</title>
     
@@ -19,9 +10,7 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
 	<meta http-equiv="expires" content="0">    
 	<meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
 	<meta http-equiv="description" content="This is my page">
-	<!--
-	<link rel="stylesheet" type="text/css" href="styles.css">
-	-->
+
 
   </head>
   
@@ -33,35 +22,35 @@ String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.
 				
 			</td>
 			<td>
-				<form action="<s:Base />/registration/register" method="post">
+				<form action="<@base />/registration/register" method="post">
 					<table  class="datatable">
 						<tr>
-							<td><s:Locale code="register.lastname"/></td>
+							<td><@locale code="register.lastname"/></td>
 							<td><input type='text' id="lastName" name="lastName" value="" /></td>
 						</tr>
 						<tr>
-							<td><s:Locale code="register.firstname"/></td>
+							<td><@locale code="register.firstname"/></td>
 							<td><input type='text' id="firstName" name="firstName" value="" /></td>
 						</tr>
 						<tr>
-							<td><s:Locale code="register.workemail"/></td>
+							<td><@locale code="register.workemail"/></td>
 							<td><input type='text' id="workEmail" name="workEmail" value="" /></td>
 						</tr>
 						<tr>
-							<td><s:Locale code="register.company"/></td>
+							<td><@locale code="register.company"/></td>
 							<td><input type='text' id="company" name="company" value="" /></td>
 						</tr>
 						<tr>
-							<td><s:Locale code="register.workphone"/></td>
+							<td><@locale code="register.workphone"/></td>
 							<td><input type='text' id="workPhone" name="workPhone" value="" /></td>
 						</tr>
 						
 						<tr style="display:none">
-							<td><s:Locale code="register.users"/></td>
+							<td><@locale code="register.users"/></td>
 							<td><input type='text' id="users" name="users" value="0" /></td>
 						</tr>
 						<tr>
-							<td  colspan="2"><input id="registerBtn" class="button" type="submit" value="<s:Locale code="register.button.register" />"/></td>
+							<td  colspan="2"><input id="registerBtn" class="button" type="submit" value="<@locale code="register.button.register" />"/></td>
 						</tr>
 						
 					</table>

+ 30 - 0
maxkey-web-maxkey/src/main/resources/templates/views/registration/registered.ftl

@@ -0,0 +1,30 @@
+<!DOCTYPE HTML >
+<html>
+  <head>
+     <base href="<@base/>">
+    
+    <title>Registered</title>
+    
+	<meta http-equiv="pragma" content="no-cache">
+	<meta http-equiv="cache-control" content="no-cache">
+	<meta http-equiv="expires" content="0">    
+	<meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
+	<meta http-equiv="description" content="Registered">
+
+  </head>
+  
+  <body>
+  <#if 2==registered>
+  		company ${company} registered,please change company name.<br>
+  		<input type="button"  class="button"  value="后退"  onclick="javascript:history.go(-1);">  
+  </#if>
+  
+  <#if 1==registered>
+  		please activate by you email .
+  </#if>
+  
+  <#if 0==registered>
+  		please activate by you email .
+  </#if>
+  </body>
+</html>

+ 0 - 41
maxkey-web-maxkey/src/main/resources/templates/views/registration/registered.jsp

@@ -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+"/";
-%>
-
-<!DOCTYPE HTML >
-<html>
-  <head>
-    <base href="<%=basePath%>">
-    
-    <title>Registered</title>
-    
-	<meta http-equiv="pragma" content="no-cache">
-	<meta http-equiv="cache-control" content="no-cache">
-	<meta http-equiv="expires" content="0">    
-	<meta http-equiv="keywords" content="keyword1,keyword2,keyword3">
-	<meta http-equiv="description" content="Registered">
-
-  </head>
-  
-  <body>
-  <c:if test="${2==registered}">
-  		company ${company} registered,please change company name.<br>
-  		<input type="button"  class="button"  value="后退"  onclick="javascript:history.go(-1);">  
-  </c:if>
-  
-  <c:if test="${1==registered}">
-  		please activate by you email .
-  </c:if>
-  
-  <c:if test="${0==registered}">
-  		please activate by you email .
-  </c:if>
-  </body>
-</html>