Przeglądaj źródła

mgt-update

mgt-update
shimingxy 5 lat temu
rodzic
commit
24a7540718
53 zmienionych plików z 1821 dodań i 2899 usunięć
  1. 210 1
      maxkey-core/src/main/java/org/maxkey/domain/Organizations.java
  2. 10 7
      maxkey-core/src/main/java/org/maxkey/web/tag/LocaleTagDirective.java
  3. 0 15
      maxkey-core/src/main/java/org/maxkey/web/tag/St.java
  4. 0 13
      maxkey-dao/src/main/java/org/maxkey/dao/persistence/NavigationsMapper.java
  5. 7 0
      maxkey-dao/src/main/java/org/maxkey/dao/persistence/OrganizationsMapper.java
  6. 0 26
      maxkey-dao/src/main/java/org/maxkey/dao/service/NavigationsService.java
  7. 24 0
      maxkey-dao/src/main/java/org/maxkey/dao/service/OrganizationsService.java
  8. 0 80
      maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/NavigationsMapper.xml
  9. 3 1
      maxkey-web-manage/.settings/org.eclipse.core.resources.prefs
  10. 175 0
      maxkey-web-manage/src/main/java/org/maxkey/web/contorller/OrganizationsController.java
  11. 6 6
      maxkey-web-manage/src/main/java/org/maxkey/web/contorller/UserInfoController.java
  12. 0 1
      maxkey-web-manage/src/main/java/org/maxkey/web/interceptor/PermissionAdapter.java
  13. 1 0
      maxkey-web-manage/src/main/resources/application.properties
  14. 49 1
      maxkey-web-manage/src/main/resources/messages/message.properties
  15. 0 0
      maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsAdd.ftl
  16. 0 0
      maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsAddSelect.ftl
  17. 1 1
      maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsList.ftl
  18. 0 0
      maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsUpdate.ftl
  19. 21 0
      maxkey-web-manage/src/main/resources/templates/views/apps/appAdd.ftl
  20. 0 25
      maxkey-web-manage/src/main/resources/templates/views/apps/appAdd.jsp
  21. 17 23
      maxkey-web-manage/src/main/resources/templates/views/apps/appAddCommon.ftl
  22. 30 0
      maxkey-web-manage/src/main/resources/templates/views/apps/appUpdate.ftl
  23. 0 35
      maxkey-web-manage/src/main/resources/templates/views/apps/appUpdate.jsp
  24. 18 23
      maxkey-web-manage/src/main/resources/templates/views/apps/appUpdateCommon.ftl
  25. 0 0
      maxkey-web-manage/src/main/resources/templates/views/apps/selectAppsList.ftl
  26. 0 0
      maxkey-web-manage/src/main/resources/templates/views/config/ipaddrfilter/ipaddrfilterAdd.ftl
  27. 0 57
      maxkey-web-manage/src/main/resources/templates/views/config/ipaddrfilter/ipaddrfilterList2.jsp
  28. 0 0
      maxkey-web-manage/src/main/resources/templates/views/config/ipaddrfilter/ipaddrfilterUpdate.ftl
  29. 16 17
      maxkey-web-manage/src/main/resources/templates/views/config/passwordpolicy/passwordpolicy.ftl
  30. 0 0
      maxkey-web-manage/src/main/resources/templates/views/groupapp/addGroupAppsList.ftl
  31. 0 0
      maxkey-web-manage/src/main/resources/templates/views/groupapp/groupAppsList.ftl
  32. 0 0
      maxkey-web-manage/src/main/resources/templates/views/groups/groupAdd.ftl
  33. 0 0
      maxkey-web-manage/src/main/resources/templates/views/groups/groupUpdate.ftl
  34. 0 0
      maxkey-web-manage/src/main/resources/templates/views/groups/selectGroupsList.ftl
  35. 0 0
      maxkey-web-manage/src/main/resources/templates/views/groupuser/addGroupUsersList.ftl
  36. 0 0
      maxkey-web-manage/src/main/resources/templates/views/groupuser/groupUsersList.ftl
  37. 183 12
      maxkey-web-manage/src/main/resources/templates/views/orgs/orgsList.ftl
  38. 0 206
      maxkey-web-manage/src/main/resources/templates/views/orgs/orgsList2.jsp
  39. 0 0
      maxkey-web-manage/src/main/resources/templates/views/orgs/orgsSelect.ftl
  40. 501 0
      maxkey-web-manage/src/main/resources/templates/views/userinfo/userAdd.ftl
  41. 0 51
      maxkey-web-manage/src/main/resources/templates/views/userinfo/userAdd.jsp
  42. 0 250
      maxkey-web-manage/src/main/resources/templates/views/userinfo/userAddBasic.jsp
  43. 0 404
      maxkey-web-manage/src/main/resources/templates/views/userinfo/userAddCompany.jsp
  44. 0 428
      maxkey-web-manage/src/main/resources/templates/views/userinfo/userAddHome.jsp
  45. 501 0
      maxkey-web-manage/src/main/resources/templates/views/userinfo/userUpdate.ftl
  46. 0 54
      maxkey-web-manage/src/main/resources/templates/views/userinfo/userUpdate.jsp
  47. 0 254
      maxkey-web-manage/src/main/resources/templates/views/userinfo/userUpdateBasic.jsp
  48. 0 415
      maxkey-web-manage/src/main/resources/templates/views/userinfo/userUpdateCompany.jsp
  49. 0 444
      maxkey-web-manage/src/main/resources/templates/views/userinfo/userUpdateHome.jsp
  50. 8 8
      maxkey-web-manage/src/main/resources/templates/views/userinfo/usersList.ftl
  51. 0 0
      maxkey-web-manage/src/main/resources/templates/views/userinfo/usersSelect.ftl
  52. 0 1
      maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/PermissionAdapter.java
  53. 40 40
      maxkey-web-maxkey/src/main/resources/templates/views/profile/myProfile.ftl

+ 210 - 1
maxkey-core/src/main/java/org/maxkey/domain/Organizations.java

@@ -2,10 +2,43 @@ package org.maxkey.domain;
 
 import java.io.Serializable;
 
+import javax.persistence.Column;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.Table;
+
 import org.apache.mybatis.jpa.persistence.JpaBaseDomain;
 
+@Table(name = "ORGANIZATIONS") 
 public class Organizations extends JpaBaseDomain implements Serializable{
-
+	
+	@Id
+	@Column
+	@GeneratedValue(strategy=GenerationType.AUTO,generator="uuid")
+	private String id;
+  private String code;
+  private String name;
+  private String fullName;
+  private String pId;
+  private String pName;
+  private String type;
+  private String xPath;
+  private String xNamePath;
+  private String level;
+  private String hasChild;
+  private String division;
+  private String country;
+  private String region;
+  private String locality;
+  private String street;
+  private String address;
+  private String contact;
+  private String postalCode;
+  private String phone;
+  private String fax;
+  private String email;
+	  
 	/**
 	 * 
 	 */
@@ -15,4 +48,180 @@ public class Organizations extends JpaBaseDomain implements Serializable{
 		// TODO Auto-generated constructor stub
 	}
 
+	public String getId() {
+		return id;
+	}
+
+	public void setId(String id) {
+		this.id = id;
+	}
+
+	public String getCode() {
+		return code;
+	}
+
+	public void setCode(String code) {
+		this.code = code;
+	}
+
+	public String getName() {
+		return name;
+	}
+
+	public void setName(String name) {
+		this.name = name;
+	}
+
+	public String getFullName() {
+		return fullName;
+	}
+
+	public void setFullName(String fullName) {
+		this.fullName = fullName;
+	}
+
+	public String getpId() {
+		return pId;
+	}
+
+	public void setpId(String pId) {
+		this.pId = pId;
+	}
+
+	public String getpName() {
+		return pName;
+	}
+
+	public void setpName(String pName) {
+		this.pName = pName;
+	}
+
+	public String getType() {
+		return type;
+	}
+
+	public void setType(String type) {
+		this.type = type;
+	}
+
+	public String getxPath() {
+		return xPath;
+	}
+
+	public void setxPath(String xPath) {
+		this.xPath = xPath;
+	}
+
+	public String getxNamePath() {
+		return xNamePath;
+	}
+
+	public void setxNamePath(String xNamePath) {
+		this.xNamePath = xNamePath;
+	}
+
+	public String getLevel() {
+		return level;
+	}
+
+	public void setLevel(String level) {
+		this.level = level;
+	}
+
+	public String getHasChild() {
+		return hasChild;
+	}
+
+	public void setHasChild(String hasChild) {
+		this.hasChild = hasChild;
+	}
+
+	public String getDivision() {
+		return division;
+	}
+
+	public void setDivision(String division) {
+		this.division = division;
+	}
+
+	public String getCountry() {
+		return country;
+	}
+
+	public void setCountry(String country) {
+		this.country = country;
+	}
+
+	public String getRegion() {
+		return region;
+	}
+
+	public void setRegion(String region) {
+		this.region = region;
+	}
+
+	public String getLocality() {
+		return locality;
+	}
+
+	public void setLocality(String locality) {
+		this.locality = locality;
+	}
+
+	public String getStreet() {
+		return street;
+	}
+
+	public void setStreet(String street) {
+		this.street = street;
+	}
+
+	public String getAddress() {
+		return address;
+	}
+
+	public void setAddress(String address) {
+		this.address = address;
+	}
+
+	public String getContact() {
+		return contact;
+	}
+
+	public void setContact(String contact) {
+		this.contact = contact;
+	}
+
+	public String getPostalCode() {
+		return postalCode;
+	}
+
+	public void setPostalCode(String postalCode) {
+		this.postalCode = postalCode;
+	}
+
+	public String getPhone() {
+		return phone;
+	}
+
+	public void setPhone(String phone) {
+		this.phone = phone;
+	}
+
+	public String getFax() {
+		return fax;
+	}
+
+	public void setFax(String fax) {
+		this.fax = fax;
+	}
+
+	public String getEmail() {
+		return email;
+	}
+
+	public void setEmail(String email) {
+		this.email = email;
+	}
+
 }

+ 10 - 7
maxkey-core/src/main/java/org/maxkey/web/tag/LocaleTagDirective.java

@@ -1,18 +1,14 @@
 package org.maxkey.web.tag;
 
 import java.io.IOException;
-import java.util.Locale;
 import java.util.Map;
 
 import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
-
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.web.servlet.support.RequestContextUtils;
 import org.springframework.web.context.WebApplicationContext;
-import org.springframework.web.servlet.support.RequestContext;
-import org.springframework.web.servlet.tags.RequestContextAwareTag;
-
 import freemarker.core.Environment;
 import freemarker.template.TemplateDirectiveBody;
 import freemarker.template.TemplateDirectiveModel;
@@ -27,6 +23,7 @@ import freemarker.template.TemplateModel;
 
 @FreemarkerTag("locale")
 public class LocaleTagDirective implements TemplateDirectiveModel {
+	private static final Logger _logger = LoggerFactory.getLogger(LocaleTagDirective.class);
 	@Autowired
     private HttpServletRequest request;
 	
@@ -38,7 +35,13 @@ public class LocaleTagDirective implements TemplateDirectiveModel {
 			if(params.get("code")==null) {
 				env.getOut().append(RequestContextUtils.getLocale(request).getLanguage());
 			}else {
-				env.getOut().append(webApplicationContext.getMessage(params.get("code").toString(), null, RequestContextUtils.getLocale(request)));
+				_logger.trace("message code "+params.get("code"));
+				try {
+					env.getOut().append(webApplicationContext.getMessage(params.get("code").toString(), null, RequestContextUtils.getLocale(request)));
+			
+				}catch(Exception e) {
+					_logger.error("message code "+params.get("code"),e);
+				}
 			}
 	}
 

+ 0 - 15
maxkey-core/src/main/java/org/maxkey/web/tag/St.java

@@ -1,15 +0,0 @@
-package org.maxkey.web.tag;
-
-public class St {
-
-	public static void main(String[] args) {
-		// TODO Auto-generated method stub
-		String cv="com.ddm.core.utils.TestClass@InnerClass1@InnerClass2@p2";
-		
-		String[] c = cv.trim().split("@");
-		for(String cs : c) {
-			System.out.println(cs);
-		}
-	}
-
-}

+ 0 - 13
maxkey-dao/src/main/java/org/maxkey/dao/persistence/NavigationsMapper.java

@@ -1,13 +0,0 @@
-package org.maxkey.dao.persistence;
-
-import org.apache.mybatis.jpa.persistence.IJpaBaseMapper;
-import org.maxkey.domain.Navigations;
-
-
-/**
- * @author Crystal.Sea
- *
- */
-public interface NavigationsMapper  extends IJpaBaseMapper<Navigations>{
-	
-}

+ 7 - 0
maxkey-dao/src/main/java/org/maxkey/dao/persistence/OrganizationsMapper.java

@@ -0,0 +1,7 @@
+package org.maxkey.dao.persistence;
+import org.apache.mybatis.jpa.persistence.IJpaBaseMapper;
+import org.maxkey.domain.Organizations;
+
+public interface OrganizationsMapper extends IJpaBaseMapper<Organizations> {
+
+}

+ 0 - 26
maxkey-dao/src/main/java/org/maxkey/dao/service/NavigationsService.java

@@ -1,26 +0,0 @@
-package org.maxkey.dao.service;
-
-import org.apache.mybatis.jpa.persistence.JpaBaseService;
-import org.maxkey.dao.persistence.NavigationsMapper;
-import org.maxkey.domain.Navigations;
-import org.springframework.stereotype.Service;
-
-
-@Service
-public class NavigationsService  extends JpaBaseService<Navigations>{
-
-	public NavigationsService() {
-		super(NavigationsMapper.class);
-		
-	}
-	
-	/* (non-Javadoc)
-	 * @see com.connsec.db.service.BaseService#getMapper()
-	 */
-	@Override
-	public NavigationsMapper getMapper() {
-		// TODO Auto-generated method stub
-		return (NavigationsMapper)super.getMapper();
-	}
-
-}

+ 24 - 0
maxkey-dao/src/main/java/org/maxkey/dao/service/OrganizationsService.java

@@ -0,0 +1,24 @@
+package org.maxkey.dao.service;
+
+import org.apache.mybatis.jpa.persistence.JpaBaseService;
+import org.maxkey.dao.persistence.OrganizationsMapper;
+import org.maxkey.domain.Organizations;
+import org.springframework.stereotype.Service;
+
+@Service
+public class OrganizationsService  extends JpaBaseService<Organizations>{
+
+	public OrganizationsService() {
+		super(OrganizationsMapper.class);
+	}
+
+	/* (non-Javadoc)
+	 * @see com.connsec.db.service.BaseService#getMapper()
+	 */
+	@Override
+	public OrganizationsMapper getMapper() {
+		// TODO Auto-generated method stub
+		return (OrganizationsMapper)super.getMapper();
+	}
+	
+}

+ 0 - 80
maxkey-dao/src/main/resources/org/maxkey/dao/persistence/xml/mysql/NavigationsMapper.xml

@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
-<mapper namespace="org.maxkey.dao.persistence.NavigationsMapper" >
-
-	<sql id="dao_where_statement">
-    	<if test="id != null and id != ''">
-			AND	ID	=	#{id} 	
-		</if> 
-		<if test="name != null and name != '' ">
-			AND	NAME	like	'%#{name}%'
-		</if>
-		<if test="pId != null and pId != '' ">
-			AND	PID	=	#{pId}
-		</if>
-		<if test="pName != null and pName != ''">
-			AND	PNAME	like	'%#{pName}%'
-		</if>
-    </sql>
-	
-   
-    
-     <select id="grid" parameterType="Navigations" resultType="Navigations">
-    	SELECT 
-			ID,
-			NAME ,
-			URL ,
-			TARGET,
-			TYPE,
-			PID,
-			PNAME,
-			SORTORDER,
-			VISIBLE,
-			XPATH,
-			STATUS,
-			HASCHILD,
-			DESCRIPTION
-    	FROM NAVIGATIONS 
-    	WHERE	1	=	1
-    	<include refid="dao_where_statement"/>
-    </select>
-    
-     
-     
-    <select  id="count" resultType="java.lang.Integer">
-    	SELECT COUNT(*) FROM NAVIGATIONS
-    	WHERE	1	=	1
-    	<include refid="dao_where_statement"/>
-    </select>
-    
-   
-    
-    <update id="logisticDelete" parameterType="Navigations" >
-    	UPDATE NAVIGATIONS SET STATUS	=	'2'  
-    		WHERE	1	=	1
-    	<if test="id != null and id != '' ">
-			AND	ID	=	#{id}
-		</if>
-		<if test="name != name">
-			ADN	ID	=	#{id}
-		</if>
-		<if test="enable != null">
-			ADN	STATUS	=	'1'
-		</if>
-		<if test="xPath != null">
-			ADN	XPATH	=	#{xPath}
-		</if>
-    </update>
-    
-    <update id="logisticBatchDelete" parameterType="java.util.List">
-    	UPDATE NAVIGATIONS SET STATUS	=	'2'  
-    		 WHERE ID IN
-		<foreach collection="ids" item="selectId"  open="(" separator="," close=")">  
-        	#{selectId}   
-     	</foreach>
-    </update>
-    
-   
-    
-
-</mapper>

+ 3 - 1
maxkey-web-manage/.settings/org.eclipse.core.resources.prefs

@@ -1,2 +1,4 @@
 eclipse.preferences.version=1
-encoding/<project>=UTF-8
+encoding//src/main/resources/templates/views/apps/appAddCommon.ftl=UTF-8
+encoding//src/main/resources/templates/views/apps/appUpdateCommon.ftl=UTF-8
+encoding/<project>=UTF-8

+ 175 - 0
maxkey-web-manage/src/main/java/org/maxkey/web/contorller/OrganizationsController.java

@@ -0,0 +1,175 @@
+package org.maxkey.web.contorller;
+
+import java.util.HashMap;
+import java.util.List;
+
+import org.maxkey.dao.service.OrganizationsService;
+import org.maxkey.domain.Organizations;
+import org.maxkey.web.WebContext;
+import org.maxkey.web.component.TreeNode;
+import org.maxkey.web.component.TreeNodeList;
+import org.maxkey.web.message.Message;
+import org.maxkey.web.message.MessageType;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.ModelAttribute;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.ResponseBody;
+import org.springframework.web.servlet.ModelAndView;
+
+
+@Controller
+@RequestMapping({"/orgs"})
+public class OrganizationsController{
+  static final Logger _logger = LoggerFactory.getLogger(OrganizationsController.class);
+
+  
+  @Autowired
+  OrganizationsService organizationsService;
+
+  
+  @ResponseBody
+  @RequestMapping({"/tree"})
+  public List<HashMap<String, Object>> organizationsTree(@RequestParam(value = "id", required = false) String id) {
+    _logger.debug("organizationsTree id :" + id);
+    Organizations org = new Organizations();
+    List<Organizations> organizationsList = this.organizationsService.query(org);
+    
+    Organizations rootOrganization = new Organizations();
+    rootOrganization.setId("1");
+    rootOrganization.setName("");
+    rootOrganization.setFullName("");
+    rootOrganization.setpName("Root");
+    rootOrganization.setxPath("/1");
+    rootOrganization.setxNamePath("/" );
+    rootOrganization.setpId("-1");
+    
+    TreeNodeList treeNodeList = new TreeNodeList();
+    TreeNode rootTreeNode = new TreeNode("1", "");
+    rootTreeNode.setAttr("data", rootOrganization);
+    rootTreeNode.setPId(rootOrganization.getpId());
+    rootTreeNode.setAttr("open", Boolean.valueOf(true));
+    treeNodeList.addTreeNode(rootTreeNode.getAttr());
+    
+    for (Organizations organization : organizationsList) {
+      TreeNode treeNode = new TreeNode(organization.getId(), organization.getName());
+      if (organization.getHasChild() != null && organization.getHasChild().equals(Character.valueOf('Y'))) {
+        treeNode.setHasChild();
+      }
+
+      
+      treeNode.setAttr("data", organization);
+      treeNode.setPId(organization.getpId());
+      if (organization.getId().equals("1")) {
+        treeNode.setAttr("open", Boolean.valueOf(true));
+      } else {
+        treeNode.setAttr("open", Boolean.valueOf(false));
+      } 
+      treeNodeList.addTreeNode(treeNode.getAttr());
+    } 
+
+    
+    return treeNodeList.getTreeNodeList();
+  }
+
+
+  
+  @RequestMapping({"/list"})
+  public ModelAndView orgsTreeList() { return new ModelAndView("orgs/orgsList"); }
+
+
+
+  
+  @RequestMapping({"/orgsSelect/{deptId}/{department}"})
+  public ModelAndView orgsSelect(@PathVariable("deptId") String deptId, @PathVariable("department") String department) {
+    ModelAndView modelAndView = new ModelAndView("orgs/orgsSelect");
+    modelAndView.addObject("deptId", deptId);
+    modelAndView.addObject("department", department);
+    return modelAndView;
+  }
+
+
+
+
+
+
+  
+  @ResponseBody
+  @RequestMapping({"/add"})
+  public Message insert(@ModelAttribute("organization") Organizations organization) {
+    _logger.debug("-Add  :" + organization);
+    if (null == organization.getId() || organization.getId().equals("")) {
+      organization.generateId();
+    }
+    
+    if (this.organizationsService.insert(organization)) {
+      return new Message(WebContext.getI18nValue("message.action.insert.success"), MessageType.success);
+    }
+    
+    return new Message(WebContext.getI18nValue("message.action.insert.success"), MessageType.error);
+  }
+
+
+
+
+
+
+
+  
+  @ResponseBody
+  @RequestMapping({"/query"})
+  public Message query(@ModelAttribute("organization") Organizations organization) {
+    _logger.debug("-query  :" + organization);
+    if (this.organizationsService.load(organization) != null) {
+      return new Message(WebContext.getI18nValue("message.action.insert.success"), MessageType.success);
+    }
+    
+    return new Message(WebContext.getI18nValue("message.action.insert.error"), MessageType.error);
+  }
+
+
+
+
+
+
+
+  
+  @ResponseBody
+  @RequestMapping({"/update"})
+  public Message update(@ModelAttribute("organization") Organizations organization) {
+    _logger.debug("-update  organization :" + organization);
+    if (this.organizationsService.update(organization)) {
+      return new Message(WebContext.getI18nValue("message.action.update.success"), MessageType.success);
+    }
+    
+    return new Message(WebContext.getI18nValue("message.action.update.error"), MessageType.error);
+  }
+
+
+
+
+
+
+
+  
+  @ResponseBody
+  @RequestMapping({"/delete"})
+  public Message delete(@ModelAttribute("organization") Organizations organization) {
+    _logger.debug("-delete  organization :" + organization);
+    if (this.organizationsService.delete(organization)) {
+      return new Message(WebContext.getI18nValue("message.action.delete.success"), MessageType.success);
+    }
+    
+    return new Message(WebContext.getI18nValue("message.action.delete.success"), MessageType.error);
+  }
+
+
+
+  
+  @RequestMapping({"/orgUsersList"})
+  public ModelAndView orgUsersList() { return new ModelAndView("orgs/orgUsersList"); }
+}

+ 6 - 6
maxkey-web-manage/src/main/java/org/maxkey/web/contorller/UserInfoController.java

@@ -71,9 +71,9 @@ public class UserInfoController {
 		
 	}
 	
-	@RequestMapping(value={"/forwardSelectUserType"})
+	@RequestMapping(value={"/forwardAdd"})
 	public ModelAndView forwardSelectUserType(){
-		ModelAndView modelAndView=new ModelAndView("users/selectUserTypeList");
+		ModelAndView modelAndView=new ModelAndView("/userinfo/userAdd");
 		//List<UserType> userTypeList=userTypeService.query(null);
 		//modelAndView.addObject("userTypeList", userTypeList);
 		return modelAndView;
@@ -84,14 +84,14 @@ public class UserInfoController {
 	
 	@RequestMapping(value={"/list"})
 	public ModelAndView usersList(){
-		return new ModelAndView("userinfo/usersList");
+		return new ModelAndView("/userinfo/usersList");
 	}
 	
 	@RequestMapping(value={"/usersSelect/{uid}/{username}"})
 	public ModelAndView usersSelect(
 			@PathVariable("uid") String uid,
 			@PathVariable("username") String username){
-		ModelAndView modelAndView= new ModelAndView("users/usersSelect");
+		ModelAndView modelAndView= new ModelAndView("/userinfo/usersSelect");
 		modelAndView.addObject("uid", uid);
 		modelAndView.addObject("username", username);
 		return modelAndView;
@@ -123,7 +123,7 @@ public class UserInfoController {
 	
 	@RequestMapping(value={"/forwardUpdate/{id}"})
 	public ModelAndView forwardUpdateUsers(@PathVariable("id")String id){
-		ModelAndView modelAndView=new ModelAndView("users/userUpdate");
+		ModelAndView modelAndView=new ModelAndView("/userinfo/userUpdate");
 		UserInfo userInfo=new UserInfo();
 		userInfo.setId(id);
 		userInfo=userInfoService.load(userInfo);
@@ -233,7 +233,7 @@ public class UserInfoController {
 	
 	@RequestMapping(value={"/forwardChangePassword/{id}"})
 	public ModelAndView forwardChangePassword(@PathVariable("id")String id){
-		ModelAndView modelAndView=new ModelAndView("users/changePassword");
+		ModelAndView modelAndView=new ModelAndView("/userinfo/changePassword");
 		UserInfo userInfo=new UserInfo();
 		userInfo.setId(id);
 		userInfo=userInfoService.load(userInfo);

+ 0 - 1
maxkey-web-manage/src/main/java/org/maxkey/web/interceptor/PermissionAdapter.java

@@ -8,7 +8,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.maxkey.config.ApplicationConfig;
-import org.maxkey.dao.service.NavigationsService;
 import org.maxkey.domain.Navigations;
 import org.maxkey.domain.UserInfo;
 import org.maxkey.web.WebContext;

+ 1 - 0
maxkey-web-manage/src/main/resources/application.properties

@@ -15,6 +15,7 @@ spring.freemarker.expose-request-attributes=false
 spring.freemarker.expose-session-attributes=false
 spring.freemarker.request-context-attribute=request
 spring.freemarker.suffix=.ftl
+#spring.freemarker.settings.classic_compatible=true
 
 #static resources
 spring.mvc.static-path-pattern=/static/**

+ 49 - 1
maxkey-web-manage/src/main/resources/messages/message.properties

@@ -32,6 +32,23 @@ common.text.createdby=\u521B\u5EFA\u4EBA
 common.text.createddate=\u521B\u5EFA\u65F6\u95F4
 common.text.modifiedby=\u4FEE\u6539\u4EBA
 common.text.modifieddate=\u4FEE\u6539\u65F6\u95F4
+
+common.text.status.start=\u5F00\u59CB
+common.text.status.normal=\u6B63\u5E38
+common.text.status.validated=\u6709\u6548
+common.text.status.inactive=\u4E0D\u6D3B\u52A8
+common.text.status.activate=\u6D3B\u52A8
+common.text.status.approved=\u6279\u51C6
+common.text.status.stop=\u505C\u6B62
+common.text.status.enabled=\u542F\u7528
+common.text.status.disabled=\u505C\u7528
+common.text.status.lock=\u9501\u5B9A
+common.text.status.unlock=\u89E3\u9501
+common.text.status.invalid=\u65E0\u6548
+common.text.status.expired=\u8FC7\u671F
+common.text.status.delete=\u5220\u9664
+
+
 		
 login.text.login.twofactor.obtain.valid=\u91CD\u65B0\u83B7\u53D6
 login.text.login.twofactor.obtain=\u83B7\u53D6\u52A8\u6001\u9A8C\u8BC1\u7801
@@ -59,16 +76,46 @@ login.password.initial.change.tip=\u9996\u6B21\u767B\u5F55\uFF0C\u8BF7\u4FEE\u65
 login.password.changepassword=\u5BC6\u7801\u4FEE\u6539
 login.password.applogin.changepassword=\u5E94\u7528\u767B\u5F55\u5BC6\u7801\u8BBE\u7F6E
 
+login.passwordpolicy=\u5BC6\u7801\u7B56\u7565
+login.passwordpolicy.minlength=\u6700\u5C0F\u957F\u5EA6
+login.passwordpolicy.maxlength=\u6700\u5927\u957F\u5EA6
+login.passwordpolicy.lowercase=\u5305\u542B\u5C0F\u5199\u5B57\u6BCD
+login.passwordpolicy.uppercase=\u5305\u542B\u5927\u5199\u5B57\u6BCD
+login.passwordpolicy.digits=\u5305\u542B\u6570\u5B57
+login.passwordpolicy.specialchar=\u7279\u6B8A\u5B57\u7B26
+login.passwordpolicy.attempts=\u767B\u5F55\u5C1D\u8BD5\u6B21\u6570
+login.passwordpolicy.duration=\u81EA\u52A8\u89E3\u9664
+login.passwordpolicy.expiration=\u8FC7\u671F\u65F6\u95F4
+login.passwordpolicy.username=\u5305\u542B\u7528\u6237\u540D
+login.passwordpolicy.simplepasswords=\u7B80\u5355\u5BC6\u7801
+
+
 login.social.link=\u7ED1\u5B9A
 login.social.unlink=\u89E3\u9664
 login.social.icon=\u56FE\u6807
 login.social.provider=\u4F9B\u5E94\u5546
 
+#
+userinfo.tab.basic=\u57FA\u672C\u4FE1\u606F
+userinfo.tab.business=\u673A\u6784\u4FE1\u606F
+userinfo.tab.personal=\u4E2A\u4EBA\u4FE1\u606F
+userinfo.tab.extra=\u6269\u5C55\u4FE1\u606F
+
 userinfo.displayName=\u7528\u6237\u540D
 userinfo.username=\u767B\u5F55\u8D26\u53F7
 userinfo.email=\u90AE\u7BB1\u5730\u5740
 userinfo.mobile=\u624B\u673A\u53F7\u7801
 userinfo.userType=\u7528\u6237\u7C7B\u578B
+userinfo.userType.employee=\u5185\u90E8\u5458\u5DE5
+userinfo.userType.contractor=\u627F\u5305\u5546
+userinfo.userType.customer=\u5BA2\u6237
+userinfo.userType.supplier=\u4F9B\u5E94\u5546
+userinfo.userType.partner=\u5408\u4F5C\u4F19\u4F34
+userinfo.userType.external=\u5916\u90E8\u7528\u6237
+userinfo.userType.intern=\u5B9E\u4E60\u751F
+userinfo.userType.temp=\u4E34\u65F6\u7528\u6237
+userinfo.userType.dealer=\u7ECF\u9500\u5546
+
 userinfo.picture=\u5934\u50CF
 userinfo.familyName=\u59D3
 userinfo.givenName=\u540D
@@ -84,6 +131,7 @@ userinfo.married.married=\u5DF2\u5A5A
 userinfo.married.divorce=\u79BB\u5F02
 userinfo.married.widowed=\u4E27\u5076
 userinfo.website=\u4e2a\u4eba\u4e3b\u9875
+userinfo.birthDate=\u51FA\u751F\u65E5\u671F
 userinfo.idtype=\u8bc1\u4ef6\u7c7b\u578b
 userinfo.idtype.unknown=\u672A\u77E5
 userinfo.idtype.idcard=\u8EAB\u4EFD\u8BC1
@@ -123,7 +171,7 @@ userinfo.homePostalCode=\u5BB6\u5EAD\u90AE\u7F16
 userinfo.homeFax=\u5BB6\u5EAD\u4F20\u771F
 userinfo.homePhoneNumber=\u5BB6\u5EAD\u7535\u8BDD
 userinfo.homeEmail=\u5BB6\u5EAD\u90AE\u7BB1
-
+userinfo.ims=\u5373\u65F6\u901A\u8BAF
 
 userinfo.authnType=\u767B\u5F55\u65B9\u5F0F
 userinfo.authnType.authnType.1=\u666E\u901A\u767B\u5F55

+ 0 - 0
maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsAdd.jsp → maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsAdd.ftl


+ 0 - 0
maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsAddSelect.jsp → maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsAddSelect.ftl


+ 1 - 1
maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsList.ftl

@@ -110,7 +110,7 @@
 			<th data-field="username"><@locale code="account.username"/></th>
 			<th data-field="displayName"><@locale code="account.displayName"/></th>
 			<th data-field="appName"><@locale code="account.appName"/></th>
-			<th data-field="appId"><@locale code="account.appId"/></th>
+			<th data-field="appId"   data-visible="false"><@locale code="account.appId"/></th>
 			<th data-field="relatedUsername"><@locale code="account.relatedUsername"/></th>
 			</tr>
 		</thead>

+ 0 - 0
maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsUpdate.jsp → maxkey-web-manage/src/main/resources/templates/views/accounts/appAccountsUpdate.ftl


+ 21 - 0
maxkey-web-manage/src/main/resources/templates/views/apps/appAdd.ftl

@@ -0,0 +1,21 @@
+
+<form id="actionForm_app"  method="post" type="label" autoclose="true"  
+			action="<@base/>/apps/basic/add"  
+			forward="<@base/>/apps/appsList"
+			enctype="multipart/form-data">		 
+  	        <!-- content -->    
+  	      	<!--table-->
+			    	      	<!--table-->
+			<table class="datatable" >
+				<tbody>
+				<tr>
+					<td ><#include  "./appAddCommon.ftl"/>
+				</tr>
+				</tbody>
+			  </table>
+  	      
+		    <input id="_method" type="hidden" name="_method"  value="post"/>
+			<input  id="status" type="hidden" name="status"  value="1"/>
+    		<input class="button" id="submitBtn" type="submit" value="<@locale code="button.text.save" />"/>
+			<input class="button" id="backBtn" type="button" value="<@locale code="button.text.cancel" />"/>	  
+</form>

+ 0 - 25
maxkey-web-manage/src/main/resources/templates/views/apps/appAdd.jsp

@@ -1,25 +0,0 @@
-<%@ page 	language="java"   import="java.util.*" 	pageEncoding="UTF-8"%>
-<%@ taglib 	prefix="spring"   uri="http://www.springframework.org/tags" %>
-<%@ taglib 	prefix="s" uri="http://www.connsec.com/tags" %>
-<%@ taglib 	prefix="fmt"      uri="http://java.sun.com/jsp/jstl/fmt"%>
-
-<form id="actionForm_app"  method="post" type="label" autoclose="true"  
-			action="<s:Base/>/apps/basic/add"  
-			forward="<s:Base/>/apps/appsList"
-			enctype="multipart/form-data">		 
-  	        <!-- content -->    
-  	      	<!--table-->
-			    	      	<!--table-->
-			<table class="datatable" >
-				<tbody>
-				<tr>
-					<td ><jsp:include page="./appAddCommon.jsp"/></td>
-				</tr>
-				</tbody>
-			  </table>
-  	      
-		    <input id="_method" type="hidden" name="_method"  value="post"/>
-			<input  id="status" type="hidden" name="status"  value="1"/>
-    		<input class="button" id="submitBtn" type="submit" value="<s:Locale code="button.text.save" />"/>
-			<input class="button" id="backBtn" type="button" value="<s:Locale code="button.text.cancel" />"/>	  
-</form>

+ 17 - 23
maxkey-web-manage/src/main/resources/templates/views/apps/appAddCommon.jsp → maxkey-web-manage/src/main/resources/templates/views/apps/appAddCommon.ftl

@@ -1,49 +1,43 @@
-<%@ page 	language="java"   import="java.util.*" 	pageEncoding="UTF-8"%>
-<%@ taglib 	prefix="spring"   uri="http://www.springframework.org/tags" %>
-<%@ taglib 	prefix="s" uri="http://www.connsec.com/tags" %>
-<%@ taglib 	prefix="fmt"      uri="http://java.sun.com/jsp/jstl/fmt"%>
-<%@ taglib  prefix="c"		  uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ page 	import="org.maxkey.constants.*"%>
 
 <!--table-->
 <table width="960"   class="datatable" >
    <tbody>
       <tr>
-         <td colspan=4><s:Locale code="apps.basic.info"/></td>
+         <td colspan=4><@locale code="apps.basic.info"/></td>
       </tr>
       <tr>
-         <th><s:Locale code="apps.id"/>:</th>
+         <th><@locale code="apps.id"/>:</th>
          <td>
          	<span id="id_text"  style="width:100%;font-weight: bold;">${model.id}</span>
             <input type="hidden" id="id" name="id"  title="" value="${model.id}"/>
          </td>
-         <th><s:Locale code="apps.secret"/>:</th>
+         <th><@locale code="apps.secret"/>:</th>
          <td>
          	<span id="secret_text"  style="width:100%;font-weight: bold;">${model.secret}</span>
             <input type="hidden" id="secret" name="secret"  title="" value="${model.secret}"/>
          </td>
       </tr>
        <tr>
-         <th><s:Locale code="apps.name"/>:</th>
+         <th><@locale code="apps.name"/>:</th>
          <td colspan="3">
             <input type="text" id="name" name="name"  size="100"  title="" value=""/>
             <b class="orange">*</b><label for="name"></label>
          </td>
       </tr>
       <tr>
-         <th><s:Locale code="apps.loginUrl"/>:</th>
+         <th><@locale code="apps.loginUrl"/>:</th>
          <td colspan="3">
             <input type="text" id="loginUrl" name="loginUrl" size="100"  title="" value=""/>
             <b class="orange">*</b><label for="loginUrl"></label>
          </td>
       </tr>
       <tr>
-         <th style="width:15%;"><s:Locale code="apps.protocol"/>:</th>
+         <th style="width:15%;"><@locale code="apps.protocol"/>:</th>
          <td style="width:35%;">
          	<span  id="protocol_text" >${model.protocol}</span>
             <input type="hidden" id="protocol" name="protocol"  title="" value="${model.protocol}"/>
          </td>
-         <th style="width:15%;"><s:Locale code="apps.category"/>:</th>
+         <th style="width:15%;"><@locale code="apps.category"/>:</th>
          <td style="width:35%;">
          	<select name="category"  class="select_t">
 				<c:forEach items="${appCategorysList}" var="appCategory">
@@ -53,40 +47,40 @@
          </td>
       </tr>
       <tr>
-         <th><s:Locale code="apps.icon"/>:</th>
+         <th><@locale code="apps.icon"/>:</th>
          <td>
             <input  type="file" id="iconFile" name="iconFile"  title="" value=""/>
             <b class="orange">*</b><label for="iconFile"></label>
          </td>
-         <th><s:Locale code="common.text.sortorder"/></th>
+         <th><@locale code="common.text.sortorder"/></th>
          <td>
          	<input  type="text" id="sortOrder" name="sortOrder"  title="" value="0"/>
             <b class="orange">*</b><label for="sortOrder"></label>
          </td>
       </tr>
       <tr>
-         <th><s:Locale code="apps.vendor"/>:</th>
+         <th><@locale code="apps.vendor"/>:</th>
          <td>
             <input  type="text" id="vendor" name="vendor"  title="" value=""/>
             <b class="orange">*</b><label for="vendor"></label>
          </td>
-         <th><s:Locale code="apps.vendor.url"/>:</th>
+         <th><@locale code="apps.vendor.url"/>:</th>
          <td>
             <input type="text" id="vendorUrl" name="vendorUrl"  title="" value=""/>
             <b class="orange">*</b><label for="vendorUrl"></label>
          </td>
       </tr>
       <tr>
-      	<th><s:Locale code="apps.visible"/></th>
+      	<th><@locale code="apps.visible"/></th>
          <td>
          	<select  id="visible" name="visible" >
-				<option value="0" ><s:Locale code="apps.visible.hidden"/></option>
-				<option value="1"  selected><s:Locale code="apps.visible.all"/></option>
-				<option value="2" ><s:Locale code="apps.visible.internet"/></option>
-				<option value="3" ><s:Locale code="apps.visible.intranet"/></option>
+				<option value="0" ><@locale code="apps.visible.hidden"/></option>
+				<option value="1"  selected><@locale code="apps.visible.all"/></option>
+				<option value="2" ><@locale code="apps.visible.internet"/></option>
+				<option value="3" ><@locale code="apps.visible.intranet"/></option>
 			</select>
          </td>
-         <th><s:Locale code="common.text.description"/>:</th>
+         <th><@locale code="common.text.description"/>:</th>
          <td>
             <input  type="text" id="description" name="description"  title="" value=""/>
             <b class="orange">*</b><label for="description"></label>

+ 30 - 0
maxkey-web-manage/src/main/resources/templates/views/apps/appUpdate.ftl

@@ -0,0 +1,30 @@
+
+<script type="text/javascript">
+<!--
+$(function(){	
+	$("#generateSecret").on("click",function(){
+		$.post("<@base/>/apps/generate/secret/oauth20", {_method:"post",currTime:(new Date()).getTime()}, function(data) {
+			$("#secret").val(data+"");
+			$("#secret_text").html(data+"");
+		}); 
+	});
+	
+});
+//-->
+</script>
+<form id="actionForm_app"  method="post" type="label" autoclose="true"  
+			action="<@base/>/apps/basic/update"
+			forward="<@base/>/apps/list"  
+			enctype="multipart/form-data">		 
+  	        <!-- content -->    
+  	      	<!--table-->
+			<table   class="datatable" >
+				<tbody>
+				<tr>
+					<td ><#include  "./appUpdateCommon.ftl"/></td>
+				</tr>
+				</tbody>
+				</table>
+    		<input class="button" id="submitBtn" type="submit" value="<@locale code="button.text.save" />"/>
+			<input class="button" id="backBtn" type="button" value="<@locale code="button.text.cancel" />"/>	  
+</form>

+ 0 - 35
maxkey-web-manage/src/main/resources/templates/views/apps/appUpdate.jsp

@@ -1,35 +0,0 @@
-<%@ page 	language="java"   import="java.util.*" 	pageEncoding="UTF-8"%>
-<%@ taglib 	prefix="spring"   uri="http://www.springframework.org/tags" %>
-<%@ taglib 	prefix="s" uri="http://www.connsec.com/tags" %>
-<%@ taglib 	prefix="fmt"      uri="http://java.sun.com/jsp/jstl/fmt"%>
-<%@ taglib  prefix="c"       	uri="http://java.sun.com/jsp/jstl/core"  %>
-
-<script type="text/javascript">
-<!--
-$(function(){	
-	$("#generateSecret").on("click",function(){
-		$.post("<s:Base/>/apps/generate/secret/oauth20", {_method:"post",currTime:(new Date()).getTime()}, function(data) {
-			$("#secret").val(data+"");
-			$("#secret_text").html(data+"");
-		}); 
-	});
-	
-});
-//-->
-</script>
-<form id="actionForm_app"  method="post" type="label" autoclose="true"  
-			action="<s:Base/>/apps/basic/update"
-			forward="<s:Base/>/apps/list"  
-			enctype="multipart/form-data">		 
-  	        <!-- content -->    
-  	      	<!--table-->
-			<table   class="datatable" >
-				<tbody>
-				<tr>
-					<td ><jsp:include page="./appUpdateCommon.jsp"/></td>
-				</tr>
-				</tbody>
-				</table>
-    		<input class="button" id="submitBtn" type="submit" value="<s:Locale code="button.text.save" />"/>
-			<input class="button" id="backBtn" type="button" value="<s:Locale code="button.text.cancel" />"/>	  
-</form>

+ 18 - 23
maxkey-web-manage/src/main/resources/templates/views/apps/appUpdateCommon.jsp → maxkey-web-manage/src/main/resources/templates/views/apps/appUpdateCommon.ftl

@@ -1,8 +1,3 @@
-<%@ page 	language="java"   import="java.util.*" 	pageEncoding="UTF-8"%>
-<%@ taglib 	prefix="spring"   uri="http://www.springframework.org/tags" %>
-<%@ taglib 	prefix="s" uri="http://www.connsec.com/tags" %>
-<%@ taglib 	prefix="fmt"      uri="http://java.sun.com/jsp/jstl/fmt"%>
-<%@ taglib  prefix="c"       	uri="http://java.sun.com/jsp/jstl/core"  %>
 <script type="text/javascript">
    <!--
       $(function(){	
@@ -19,42 +14,42 @@
 <table width="960"  class="datatable" >
    <tbody>
       <tr>
-         <td colspan=4><s:Locale code="apps.basic.info"/></td>
+         <td colspan=4><@locale code="apps.basic.info"/></td>
       </tr>
       <tr>
-         <th style="width:15%;"><s:Locale code="apps.id"/>:</th>
+         <th style="width:15%;"><@locale code="apps.id"/>:</th>
          <td style="width:35%;">
          	<div style="width:100%;font-weight: bold;">${model.id}</div>
             <input type="hidden" id="id" name="id"  title="" value="${model.id}"/>
             <input type="hidden" id="status" name="status"  title="" value="${model.status}"/>
          </td>
-         <th style="width:15%;"><s:Locale code="apps.secret"/>:</th>
+         <th style="width:15%;"><@locale code="apps.secret"/>:</th>
          <td style="width:35%;">
-         	<input id="generateSecret" type="button" class="button" value="<s:Locale code="button.text.generate"/>"/><br>
+         	<input id="generateSecret" type="button" class="button" value="<@locale code="button.text.generate"/>"/><br>
          	<div id="secret_text" style="width:100%;font-weight: bold;">${model.secret}</div>
             <input type="hidden" id="secret" name="secret"  title="" value="${model.secret}"/>
          </td>
       </tr>
       <tr>
-         <th><s:Locale code="apps.name"/>:</th>
+         <th><@locale code="apps.name"/>:</th>
          <td  colspan="3">
             <input type="text" id="name" name="name"  title="" value="${model.name}"/>
             <b class="orange">*</b><label for="name"></label>
          </td>
       </tr>
       <tr>
-         <th><s:Locale code="apps.loginUrl"/>:</th>
+         <th><@locale code="apps.loginUrl"/>:</th>
          <td colspan="3">
             <input type="text" id="loginUrl" name="loginUrl"  title="" value="${model.loginUrl}"/>
             <b class="orange">*</b><label for="loginUrl"></label>
          </td>
       </tr>
       <tr>
-         <th><s:Locale code="apps.protocol"/>:</th>
+         <th><@locale code="apps.protocol"/>:</th>
          <td>${model.protocol}
             <input type="hidden" id="protocol" name="protocol"  title="" value="${model.protocol}"/>
          </td>
-         <th><s:Locale code="apps.category"/>:</th>
+         <th><@locale code="apps.category"/>:</th>
          <td>
             <select name="category"  class="select_t">
 				<c:forEach items="${appCategorysList}" var="appCategory">
@@ -64,39 +59,39 @@
          </td>
       </tr>
       <tr>
-         <th><s:Locale code="apps.icon"/>:</th>
+         <th><@locale code="apps.icon"/>:</th>
          <td><img id="iconFileImg" width='30' height='30' src='<s:Base/>/image/${model.id}'/>
             <b class="orange">*</b><label for="iconFile"></label>
          </td>
-         <th><s:Locale code="common.text.sortorder"/></th>
+         <th><@locale code="common.text.sortorder"/></th>
          <td>
          	<input  type="text" id="sortOrder" name="sortOrder"  title="" value="${model.sortOrder}"/>
             <b class="orange">*</b><label for="sortOrder"></label>
          </td>
       </tr>
       <tr>
-         <th><s:Locale code="apps.vendor"/>:</th>
+         <th><@locale code="apps.vendor"/>:</th>
          <td>
             <input  type="text" id="vendor" name="vendor"  title="" value="${model.vendor}"/>
             <b class="orange">*</b><label for="vendor"></label>
          </td>
-         <th><s:Locale code="apps.vendor.url"/>:</th>
+         <th><@locale code="apps.vendor.url"/>:</th>
          <td>
             <input type="text" id="vendorUrl" name="vendorUrl"  title="" value="${model.vendorUrl}"/>
             <b class="orange">*</b><label for="vendorUrl"></label>
          </td>
       </tr>
       <tr>
-      	<th><s:Locale code="apps.visible"/></th>
+      	<th><@locale code="apps.visible"/></th>
          <td>
          	<select  id="visible" name="visible" >
-				<option value="0"  <c:if test="${0==model.visible}">selected</c:if> ><s:Locale code="apps.visible.hidden"/></option>
-				<option value="1"  <c:if test="${1==model.visible}">selected</c:if> ><s:Locale code="apps.visible.all"/></option>
-				<option value="2"  <c:if test="${2==model.visible}">selected</c:if> ><s:Locale code="apps.visible.internet"/></option>
-				<option value="3"  <c:if test="${3==model.visible}">selected</c:if> ><s:Locale code="apps.visible.intranet"/></option>
+				<option value="0"  <c:if test="${0==model.visible}">selected</c:if> ><@locale code="apps.visible.hidden"/></option>
+				<option value="1"  <c:if test="${1==model.visible}">selected</c:if> ><@locale code="apps.visible.all"/></option>
+				<option value="2"  <c:if test="${2==model.visible}">selected</c:if> ><@locale code="apps.visible.internet"/></option>
+				<option value="3"  <c:if test="${3==model.visible}">selected</c:if> ><@locale code="apps.visible.intranet"/></option>
 			</select>
          </td>
-         <th><s:Locale code="common.text.description"/>:</th>
+         <th><@locale code="common.text.description"/>:</th>
          <td>
             <input  type="text" id="description" name="description"  title="" value="${model.description}"/>
             <b class="orange">*</b><label for="description"></label>

+ 0 - 0
maxkey-web-manage/src/main/resources/templates/views/apps/selectAppsList.jsp → maxkey-web-manage/src/main/resources/templates/views/apps/selectAppsList.ftl


+ 0 - 0
maxkey-web-manage/src/main/resources/templates/views/config/ipaddrfilter/ipaddrfilterAdd.jsp → maxkey-web-manage/src/main/resources/templates/views/config/ipaddrfilter/ipaddrfilterAdd.ftl


+ 0 - 57
maxkey-web-manage/src/main/resources/templates/views/config/ipaddrfilter/ipaddrfilterList2.jsp

@@ -1,57 +0,0 @@
-<%@ page   contentType="text/html; charset=UTF-8" import="java.util.Map,java.util.LinkedHashMap" %>
-<%@ taglib prefix="s"	uri="http://www.connsec.com/tags" %>
-<%@ taglib prefix="spring"		uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="c"			uri="http://java.sun.com/jsp/jstl/core"%>
-
-<script type="text/javascript">	
-	function filterFormatter(value, options, rData){
-			if(value==1){
-				return '<s:Locale code="ipaddrfilter.filter.whitelist"/>';
-			}else{
-				return '<s:Locale code="ipaddrfilter.filter.blacklist"/>';
-			}
-	};	
-	
-	$(function () {
-	
-	});
-</script>
-
-	<div id="tool_box">
-	 		<table   class="datatable">
- 				<tr>
-		 			<td width="120px"><s:Locale code="ipaddrfilter.ipAddr"/>:</td>
-		 			<td width="374px">
-		 				<form id="basic_search_form">
-				 			<input type="text" name="ipAddr" style ="width:150px">
-				 			<input class="button primary"  id="searchBtn" type="button" size="50" value="<s:Locale code="button.text.search"/>">
-				 		</form>
-		 			</td> 
-				 	<td colspan="2"> <div id="tool_box_right">
-						<input class="button"   id="addBtn" type="button" value="<s:Locale code="button.text.add"/>"  target="window"
-				 		   	 	wurl="<s:Base/>/config/ipaddrfilter/forwardAdd" wheight="250px" >
-					 	<input class="button"   id="modifyBtn" type="button" value="<s:Locale code="button.text.edit"/>"  target="window"
-					 			wurl="<s:Base/>/config/ipaddrfilter/forwardUpdate" wheight="250px" > 
-					 		    
-					 	<input class="button"   id="deleteBtn" type="button" value="<s:Locale code="button.text.delete"/>"
-					 			wurl="<s:Base/>/config/ipaddrfilter/delete" />
-				 	</div>
-				 	</td>
-				</tr>
-			
-			</table>
- 	</div>
- 	
-	<div class="mainwrap" id="main">
-		<s:Grid id="list" url="/config/ipaddrfilter/grid" multiselect="false" resize="true">	
-			<s:Column width="0" field="id" title="id" hidden="true"/>
-			<s:Column width="50" field="ipAddr" title="ipaddrfilter.ipAddr"/>
-			<s:Column width="50" field="filter" title="ipaddrfilter.filter"   formatter="filterFormatter"/> 
-			<s:Column width="50" field="description" title="common.text.description"/>
-			<s:Column width="0" field="createdBy" title="common.text.createdby" hidden="true"/>
-			<s:Column width="0" field="createdDate" title="common.text.createddate" hidden="true"/>
-			<s:Column width="0" field="modifiedBy" title="common.text.modifiedby" hidden="true"/>
-			<s:Column width="0" field="modifiedDate" title="common.text.modifieddate" hidden="true"/>
-		</s:Grid>
-			
-	</div>

+ 0 - 0
maxkey-web-manage/src/main/resources/templates/views/config/ipaddrfilter/ipaddrfilterUpdate.jsp → maxkey-web-manage/src/main/resources/templates/views/config/ipaddrfilter/ipaddrfilterUpdate.ftl


+ 16 - 17
maxkey-web-manage/src/main/resources/templates/views/config/passwordpolicy/passwordpolicy.ftl

@@ -62,15 +62,14 @@
 					<div class="col-12 grid-margin">
 						<div class="card">
 							<div class="card-header border-bottom">
-								<h4 class="card-title">Horizontal Two column</h4>
+								<h4 class="card-title"><@locale code="login.passwordpolicy"/></h4>
 							</div>
 							<div class="card-body">
-								<form  method="post" type="label" validate="true" action="<s:Base/>/config/passwordpolicy/update" id="actionForm" >
-									<p class="card-description">Personal info</p>
+								<form  method="post" type="label" validate="true" action="<@base/>/config/passwordpolicy/update" id="actionForm" >
 									<div class="row">
 										<div class="col-md-6">
 											<div class="form-group row">
-												<label class="col-sm-3 col-form-label"><s:Locale code="passwordpolicy.minlength" />:</label>
+												<label class="col-sm-3 col-form-label"><@locale code="login.passwordpolicy.minlength" />:</label>
 												<div class="col-sm-9">
 													<input id="id" name="id" type="hidden" value="${model.id}"/>
 						   							<input  class="form-control" type="text" id="minLength" name="minLength"  value="${model.minLength}" />
@@ -79,7 +78,7 @@
 										</div>
 										<div class="col-md-6">
 											<div class="form-group row">
-												<label class="col-sm-3 col-form-label"><s:Locale code="passwordpolicy.maxlength" />:</label>
+												<label class="col-sm-3 col-form-label"><@locale code="login.passwordpolicy.maxlength" />:</label>
 												<div class="col-sm-9">
 													<input  class="form-control" type="text" id="maxLength" name="maxLength" value="${model.maxLength}" />
 												</div>
@@ -89,7 +88,7 @@
 									<div class="row">
 										<div class="col-md-6">
 											<div class="form-group row">
-												<label class="col-sm-3 col-form-label"><s:Locale code="passwordpolicy.lowercase" />:</label>
+												<label class="col-sm-3 col-form-label"><@locale code="login.passwordpolicy.lowercase" />:</label>
 												<div class="col-sm-9">
 													<input  class="form-control" type="text" id="lowerCase" name="lowerCase"  value="${model.lowerCase}" />
 												</div>
@@ -97,7 +96,7 @@
 										</div>
 										<div class="col-md-6">
 											<div class="form-group row">
-												<label class="col-sm-3 col-form-label"><s:Locale code="passwordpolicy.uppercase" />:</label>
+												<label class="col-sm-3 col-form-label"><@locale code="login.passwordpolicy.uppercase" />:</label>
 												<div class="col-sm-9">
 													<input  class="form-control" type="text" id="upperCase" name="upperCase" value="${model.upperCase}" />
 												</div>
@@ -107,7 +106,7 @@
 									<div class="row">
 										<div class="col-md-6">
 											<div class="form-group row">
-												<label class="col-sm-3 col-form-label"><s:Locale code="passwordpolicy.digits" />:</label>
+												<label class="col-sm-3 col-form-label"><@locale code="login.passwordpolicy.digits" />:</label>
 												<div class="col-sm-9">
 													<input  class="form-control" type="text" id="digits" name="digits" value="${model.digits}"/>
 												</div>
@@ -115,7 +114,7 @@
 										</div>
 										<div class="col-md-6">
 											<div class="form-group row">
-												<label class="col-sm-3"><s:Locale code="passwordpolicy.specialchar" />:</label>
+												<label class="col-sm-3"><@locale code="login.passwordpolicy.specialchar" />:</label>
 												<div class="col-sm-9">
 													<input   class="form-control" type="text" id="specialChar" name="specialChar"  value="${model.specialChar}" />
 												</div>
@@ -125,7 +124,7 @@
 									<div class="row">
 										<div class="col-md-6">
 											<div class="form-group row">
-												<label class="col-sm-3 col-form-label"><s:Locale code="passwordpolicy.attempts" />:</label>
+												<label class="col-sm-3 col-form-label"><@locale code="login.passwordpolicy.attempts" />:</label>
 												<div class="col-sm-9">
 													<input  class="form-control" type="text" id="attempts" name="attempts" value="${model.attempts}" />
 												</div>
@@ -133,7 +132,7 @@
 										</div>
 										<div class="col-md-6">
 											<div class="form-group row">
-												<label class="col-sm-3 col-form-label"><s:Locale code="passwordpolicy.duration" />(Unit:Hour):</label>
+												<label class="col-sm-3 col-form-label"><@locale code="login.passwordpolicy.duration" />(Unit:Hour):</label>
 												<div class="col-sm-9">
 													<input  class="form-control" type="text" id="duration" name="duration" value="${model.duration}"/>
 												</div>
@@ -143,7 +142,7 @@
 									<div class="row">
 										<div class="col-md-6">
 											<div class="form-group row">
-												<label class="col-sm-3 col-form-label"><s:Locale code="passwordpolicy.expiration" />(Unit:Day):</label>
+												<label class="col-sm-3 col-form-label"><@locale code="login.passwordpolicy.expiration" />(Unit:Day):</label>
 												<div class="col-sm-9">
 													<input  class="form-control" type="text" id="expiration" name="expiration"  value="${model.expiration}" />
 												</div>
@@ -151,11 +150,11 @@
 										</div>
 										<div class="col-md-6">
 											<div class="form-group row">
-												<label class="col-sm-3 col-form-label"><s:Locale code="passwordpolicy.username" />:</label>
+												<label class="col-sm-3 col-form-label"><@locale code="login.passwordpolicy.username" />:</label>
 												<div class="col-sm-9">
 													<select  class="form-control"   id="username" name="username"  >
-														<option  <c:if test="${1==model.username}">selected</c:if>  value="1"><s:Locale code="common.text.status.3"/></option>
-														<option  <c:if test="${0==model.username}">selected</c:if>  value="0"><s:Locale code="common.text.status.4"/></option>
+														<option  <#if 1==model.username>selected</#if>  value="1"><@locale code="common.text.status.enabled"/></option>
+														<option  <#if 0==model.username>selected</#if>  value="0"><@locale code="common.text.status.disabled"/></option>
 													</select>
 												</div>
 											</div>
@@ -165,14 +164,14 @@
 									<div class="row">
 										<div class="col-md-12">
 											<div class="form-group m-b-20">
-												<label   style="float: left;" for="simplePasswords"><s:Locale code="passwordpolicy.simplepasswords" />:</label>
+												<label   style="float: left;" for="simplePasswords"><@locale code="login.passwordpolicy.simplepasswords" />:</label>
 												<textarea id="simplePasswords" name="simplePasswords"  class="form-control" >${model.simplePasswords}</textarea>
 											</div>
 										</div>
 									</div>
 									<div class="row">
 										<div class="col-md-3">
-											<button type="submit" class="button btn-primary btn btn-common btn-block mr-3"    id="submitBtn" ><s:Locale code="button.text.save" /></button>
+											<button type="submit" class="button btn-primary btn btn-common btn-block mr-3"    id="submitBtn" ><@locale code="button.text.save" /></button>
 										</div>
 									</div>
 									

+ 0 - 0
maxkey-web-manage/src/main/resources/templates/views/groupapp/addGroupAppsList.jsp → maxkey-web-manage/src/main/resources/templates/views/groupapp/addGroupAppsList.ftl


+ 0 - 0
maxkey-web-manage/src/main/resources/templates/views/groupapp/groupAppsList.jsp → maxkey-web-manage/src/main/resources/templates/views/groupapp/groupAppsList.ftl


+ 0 - 0
maxkey-web-manage/src/main/resources/templates/views/groups/groupAdd.jsp → maxkey-web-manage/src/main/resources/templates/views/groups/groupAdd.ftl


+ 0 - 0
maxkey-web-manage/src/main/resources/templates/views/groups/groupUpdate.jsp → maxkey-web-manage/src/main/resources/templates/views/groups/groupUpdate.ftl


+ 0 - 0
maxkey-web-manage/src/main/resources/templates/views/groups/selectGroupsList.jsp → maxkey-web-manage/src/main/resources/templates/views/groups/selectGroupsList.ftl


+ 0 - 0
maxkey-web-manage/src/main/resources/templates/views/groupuser/addGroupUsersList.jsp → maxkey-web-manage/src/main/resources/templates/views/groupuser/addGroupUsersList.ftl


+ 0 - 0
maxkey-web-manage/src/main/resources/templates/views/groupuser/groupUsersList.jsp → maxkey-web-manage/src/main/resources/templates/views/groupuser/groupUsersList.ftl


+ 183 - 12
maxkey-web-manage/src/main/resources/templates/views/orgs/orgsList.ftl

@@ -1,12 +1,12 @@
-<%@ 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://www.connsec.com/tags" %>
-
+<!DOCTYPE HTML>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<#include  "../layout/header.ftl"/>
+	<#include  "../layout/common.cssjs.ftl"/>
 
 <script type="text/javascript">
 
+		
 function onClick (event, treeId, treeNode) {
 	  $("#actionForm").clearForm();
 	  $("#actionForm").json2form({data:treeNode.data});
@@ -16,10 +16,125 @@ function onClick (event, treeId, treeNode) {
 }
 	
 $(function () {
+
+			var treeSettings={
+				element  :  "orgsTree",
+				rootId  :  "1",
+			 	checkbox  :  null,
+			 	onClick  :  null,
+			 	onDblClick  :  null,
+			 	url  :  "<@base/>/orgs/tree"
+			};
+			
+		function singlePath(newNode) {
+			if (newNode === curExpandNode) return;
+			if (curExpandNode && curExpandNode.open==true) {
+				var zTree = $.fn.zTree.getZTreeObj(treeSettings.element);
+				if (newNode.parentTId === curExpandNode.parentTId) {
+					zTree.expandNode(curExpandNode, false);
+				} else {
+					var newParents = [];
+					while (newNode) {
+						newNode = newNode.getParentNode();
+						if (newNode === curExpandNode) {
+							newParents = null;
+							break;
+						} else if (newNode) {
+							newParents.push(newNode);
+						}
+					}
+					if (newParents!=null) {
+						var oldNode = curExpandNode;
+						var oldParents = [];
+						while (oldNode) {
+							oldNode = oldNode.getParentNode();
+							if (oldNode) {
+								oldParents.push(oldNode);
+							}
+						}
+						if (newParents.length>0) {
+							for (var i = Math.min(newParents.length, oldParents.length)-1; i>=0; i--) {
+								if (newParents[i] !== oldParents[i]) {
+									zTree.expandNode(oldParents[i], false);
+									break;
+								}
+							}
+						} else {
+							zTree.expandNode(oldParents[oldParents.length-1], false);
+						}
+					}
+				}
+			}
+			curExpandNode = newNode;
+		};
+
+
+		function beforeExpand(treeId, treeNode) {
+			var pNode = curExpandNode ? curExpandNode.getParentNode():null;
+			var treeNodeP = treeNode.parentTId ? treeNode.getParentNode():null;
+			var zTree = $.fn.zTree.getZTreeObj(""+treeSettings.element);
+			for(var i=0, l=!treeNodeP ? 0:treeNodeP.children.length; i<l; i++ ) {
+				if (treeNode !== treeNodeP.children[i]) {
+					zTree.expandNode(treeNodeP.children[i], false);
+				}
+			}
+			while (pNode) {
+				if (pNode === treeNode) {
+					break;
+				}
+				pNode = pNode.getParentNode();
+			}
+			if (!pNode) {
+				singlePath(treeNode);
+			}
+
+		};
+		
+	    $.fn.zTree.init(
+	    		$("#"+treeSettings.element), //element
+	    		{//json object 
+					check	: 	{
+						enable		: 	treeSettings.checkbox
+					},
+					async	: 	{
+						enable		: 	true,
+						url			:	treeSettings.url,
+						autoParam	:	["id", "name=n", "level=lv"],
+						otherParam	:	{"otherParam":"zTreeAsyncTest",id:treeSettings.rootId},
+						dataFilter	: 	function (treeId, parentNode, childNodes) {
+											if (!childNodes) return null;
+											for (var i=0, l=childNodes.length; i<l; i++) {
+												childNodes[i].name = childNodes[i].name.replace(/\.n/g, '.');
+											}
+											return childNodes;
+										}
+					},
+					data			: 	{
+						simpleData	: 	{
+							enable	: 	true
+						}
+					},
+					callback: {
+						onClick			: 	treeSettings.onClick,
+						onDblClick		: 	treeSettings.onDblClick,
+						beforeAsync		: 	function(treeId, treeNode){
+							$.loading();
+						},
+						onAsyncSuccess	: 	function(event, treeId, treeNode, msg){
+							$.unloading();
+						},
+						//beforeExpand	: 	beforeExpand,
+						onExpand		: 	function onExpand(event, treeId, treeNode) {
+							curExpandNode = treeNode;
+						}
+					}
+	    		}
+	    	);//end tree
+		
 	$("#addChildBtn").click(function(){
 		var nodes = $.fn.zTree.getZTreeObj("orgsTree").getSelectedNodes();
 		if (nodes.length == 0) {
-			$.alert({content:"<s:Locale code="system.menus.alert.select.pmenu" />"});
+			//$.alert({content:"<s:Locale code="system.menus.alert.select.pmenu" />"});
 			return;
 		}
 		$("#actionForm").clearForm();
@@ -69,12 +184,50 @@ $(function () {
 	});
 });
 </script>
-	 
+</head>
+<body> 
+<div class="app header-default side-nav-dark">
+<div class="layout">
+	<div class="header navbar">
+		<#include  "../layout/top.ftl"/>
+	</div>
+	
+	<div class="col-md-3 sidebar-nav side-nav" >
+ 		<#include  "../layout/sidenav.ftl"/>
+	</div>
+	<div class="page-container">
+	
+	<div class="main-content">
+					<div class="container-fluid">
+
+						<div class="breadcrumb-wrapper row">
+							<div class="col-12 col-lg-3 col-md-6">
+								<h4 class="page-title">Dashboard 2</h4>
+							</div>
+							<div class="col-12 col-lg-9 col-md-6">
+								<ol class="breadcrumb float-right">
+									<li><a href="index.html">Dashboard</a></li>
+									<li class="active">/ Dashboard 2</li>
+								</ol>
+							</div>
+						</div>
+
+					</div>
+
+
+					<div class="col-12 grid-margin">
+						<div class="card">
+							<div class="card-header border-bottom">
+								<h4 class="card-title"><@locale code="login.passwordpolicy"/></h4>
+							</div>
+							<div class="card-body">
+								 
 	     <!-- content -->  
  <table class="datatable"   width="100%" >
    <tr>
       <td valign="top"  class="td_1" style="vertical-align: top;">
-          <s:Tree rootId="1" url="/orgs/tree" id="orgsTree" onClick="onClick"/>
+      	<div id="orgsTree" class="ztree"></div>
+         
       </td>
       <td  valign="top"  class="td_1" style="vertical-align: top;">
          <div id="orgsTable" style="PADDING:0;MARGIN: 0;width:650px"></div>
@@ -191,11 +344,11 @@ $(function () {
             </table>
          		</td></tr>
          		<tr><td nowrap class="center">
-                              <input id="addChildBtn" class="button"   type="button" style="width:120px"  value="<s:Locale code="button.text.add" />"/>
+                              <input id="addChildBtn" class="button"   type="button" style="width:120px"  value="<@locale code="button.text.add" />"/>
                           
-                              <input id="saveBtn" class="button"      type="button"   style="width:100px"  value="<s:Locale code="button.text.save" />"/>
+                              <input id="saveBtn" class="button"      type="button"   style="width:100px"  value="<@locale code="button.text.save" />"/>
                            
-                              <input id="deleteBtn"  class="button"   type="button"   style="width:100px"  value="<s:Locale code="button.text.delete" />"/>
+                              <input id="deleteBtn"  class="button"   type="button"   style="width:100px"  value="<@locale code="button.text.delete" />"/>
                            
          		</td></tr>
          	</table>
@@ -204,3 +357,21 @@ $(function () {
       </td>
    </tr>
 </table>
+
+</div>
+					</div>
+					<footer class="content-footer">
+		<#include  "../layout/footer.ftl"/>
+	</footer>
+
+	</div>
+	
+	</div>
+</div>
+
+<div id="preloader">
+<div class="loader" id="loader-1"></div>
+</div>
+
+</body>
+</html>

+ 0 - 206
maxkey-web-manage/src/main/resources/templates/views/orgs/orgsList2.jsp

@@ -1,206 +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://www.connsec.com/tags" %>
-
-
-<script type="text/javascript">
-
-function onClick (event, treeId, treeNode) {
-	  $("#actionForm").clearForm();
-	  $("#actionForm").json2form({data:treeNode.data});
-	  $("#_method").val("put");
-	  $("#status").val("1");
-	 
-}
-	
-$(function () {
-	$("#addChildBtn").click(function(){
-		var nodes = $.fn.zTree.getZTreeObj("orgsTree").getSelectedNodes();
-		if (nodes.length == 0) {
-			$.alert({content:"<s:Locale code="system.menus.alert.select.pmenu" />"});
-			return;
-		}
-		$("#actionForm").clearForm();
-		$("#pId").val(nodes[0].data.id);
-	  	$("#pName").val(nodes[0].data.name);
-	  	$("#sortOrder").val(1);
-	  	$("#status").val("1");
-	    $("#_method").val("post");
-	});	
-	
-	
-	$("#saveBtn").click(function(){
-		if($("#_method").val()=="put"){
-			$("#actionForm").attr("action",'<s:Base/>/orgs/update');
-		}else{
-			$("#actionForm").attr("action",'<s:Base/>/orgs/add');
-			var nodedata =	$.fn.zTree.getZTreeObj("orgsTree").getSelectedNodes()[0].data;
-			$("#xNamePath").val(nodedata.xNamePath+"/"+$("#name").val());
-			$("#xPath").val(nodedata.xPath+"/"+$("#id").val());
-		}
-		
-		if($("#fullName").val()==""){
-			$("#fullName").val($("#name").val());
-		}
-		if($("#_method").val()=="post"){
-			var node=$("#actionForm").serializeObject();
-			node.data=$("#actionForm").serializeObject();
-			delete node['url'];
-			$.fn.zTree.getZTreeObj("orgsTree").addNodes(
-				$.fn.zTree.getZTreeObj("orgsTree").getSelectedNodes()[0],node);
-		}else{
-			var node=$("#actionForm").serializeObject();
-			node.data=$("#actionForm").serializeObject();
-			node=$.extend( $.fn.zTree.getZTreeObj("orgsTree").getSelectedNodes()[0],node);
-			delete node['url'];
-			$.fn.zTree.getZTreeObj("orgsTree").updateNode(node);
-		}
-		$('#actionForm').submit(); 
-	});	
-		
-		
-	$("#deleteBtn").click(function(){
-		$.post('<s:Base/>/orgs/delete',{ id:$("#id").val(),_method:"delete"}, function(data) {
-			$.fn.zTree.getZTreeObj("orgsTree").removeNode($.fn.zTree.getZTreeObj("orgsTree").getSelectedNodes()[0]);
- 				$.alert({content:data.message});
-		});
-	});
-});
-</script>
-	 
-	     <!-- content -->  
- <table class="datatable"   width="100%" >
-   <tr>
-      <td valign="top"  class="td_1" style="vertical-align: top;">
-          <s:Tree rootId="1" url="/orgs/tree" id="orgsTree" onClick="onClick"/>
-      </td>
-      <td  valign="top"  class="td_1" style="vertical-align: top;">
-         <div id="orgsTable" style="PADDING:0;MARGIN: 0;width:650px"></div>
-         <form  id="actionForm" action='<s:Base/>/orgs/add' method="post">
-         	<table>
-         		<tr>
-         			<td>
-						<ul class="switch_tab"  style="width:100%" >
-							<li id="switch_common" value="table_switch_common" style="width:49%" class="switch_tab_class switch_tab_current"><a href="javascript:void(0);"><s:Locale code="org.tab.basic" /></a></li>
-							<li id="switch_extra"  value="table_switch_extra" style="width:49%" class="switch_tab_class"><a href="javascript:void(0);"><s:Locale code="org.tab.extra" /></a></li>
-						</ul>
-					</td>
-         		</tr>
-         		<tr><td>
-         	<table id="table_switch_common"  class="datatable"  width="600px">
-               <tr style="display:none">
-                  <th ><input type="text" id="status" type="hidden" name="status"  value="1"/>
-                  <input type="text" id="_method" type="hidden" name="_method"  value="put"/></th>
-                  <td></td>
-               </tr>
-               <tr >
-                  <th ><s:Locale code="org.pid" />:</th>
-                  <td><span class="intspan"><input type="text" readonly id="pId" name="pId" size="80" class="int"/></span></td>
-               </tr>
-               <tr>
-                  <th  width="200px"><s:Locale code="org.pname" />:</th>
-                  <td><span class="intspan"><input type="text" readonly  id="pName" name="pName" size="80"   class="int"/></span></td>
-               </tr>
-               <tr >
-                  <th ><s:Locale code="org.id" />:</th>
-                  <td><span class="intspan"><input type="text" id="id" name="id" size="80"   class="int"/></span></td>
-               </tr>
-               <tr>
-                  <th ><s:Locale code="org.name" />:</th>
-                  <td><span class="intspan"><input type="text"  id="name" name="name"  size="80"  class="int"/></span></td>
-               </tr>
-               <tr>
-                  <th ><s:Locale code="org.fullname" />:</th>
-                  <td><span class="intspan"><input type="text"  id="fullName" name="fullName"  size="80"  class="int"/></span></td>
-               </tr>
-                <tr >
-                  <th ><s:Locale code="org.xpath" /> :
-                  </th>
-                  <td><span class="intspan"><input type="text"  id="xPath" name="xPath" size="80"   class="int"/></span></td>
-               </tr>
-               
-                <tr >
-                  <th ><s:Locale code="org.xnamepath" /> :
-                  </th>
-                  <td><span class="intspan"><input type="text"  id="xNamePath" name="xNamePath" size="80"   class="int"/></span></td>
-               </tr>
-               
-               <tr>
-                  <th ><s:Locale code="org.type" />:</th>
-                  <td><input type="text"  id="type" name="type"  size="80"  class="int"/></td>
-               </tr>
-               <tr>
-                  <th ><s:Locale code="org.division" />:</th>
-                  <td><span class="intspan"><input type="text"  id="division" name="division"  size="80"  class="int"/></span></td>
-               </tr>
-               <tr>
-                  <th >
-                     <s:Locale code="common.text.sortorder" /> :
-                  </th>
-                  <td><span class="intspan"><input type="text"  id="sortOrder" name="sortOrder"  size="80"  class="int"/></span></td>
-               </tr>
-              
-               <tr>
-                  <th ><s:Locale code="common.text.description" />:</th>
-                  <td><span class="intspan"><input type="text"  id="description" name="description"  size="80"  class="int"/></span></td>
-               </tr>
-            </table>
-            <table id="table_switch_extra"  class="datatable"  width="600px" style="display:none">
-            	<tr>
-                  <th ><s:Locale code="org.contact" />:</th>
-                  <td><span class="intspan"><input type="text"  id="contact" name="contact"  size="80"  class="int"/></span></td>
-               </tr>
-               <tr>
-                  <th  width="200px"><s:Locale code="org.phone" />:</th>
-                  <td><span class="intspan"><input type="text"  id="phone" name="phone"  size="80"  class="int"/></span></td>
-               </tr>
-                <tr>
-                  <th ><s:Locale code="org.email" />:</th>
-                  <td><span class="intspan"><input type="text"  id="email" name="email"  size="80"  class="int"/></span></td>
-               </tr>
-               <tr>
-                  <th ><s:Locale code="org.fax" />:</th>
-                  <td><span class="intspan"><input type="text"  id="fax" name="fax"  size="80"  class="int"/></span></td>
-               </tr>
-               <tr>
-                  <th ><s:Locale code="org.country" />:</th>
-                  <td><span class="intspan"><input type="text"  id="country" name="country"  size="80"  class="int"/></span></td>
-               </tr>
-               <tr>
-                  <th ><s:Locale code="org.region" />:</th>
-                  <td><span class="intspan"><input type="text"  id="region" name="region"  size="80"  class="int"/></span></td>
-               </tr>
-               <tr>
-                  <th ><s:Locale code="org.locality" />:</th>
-                  <td><span class="intspan"><input type="text"  id="locality" name="locality"  size="80"  class="int"/></span></td>
-               </tr>
-               <tr>
-                  <th ><s:Locale code="org.street" />:</th>
-                  <td><span class="intspan"><input type="text"  id="street" name="street"  size="80"  class="int"/></span></td>
-               </tr>
-               <tr>
-                  <th ><s:Locale code="org.address" />:</th>
-                  <td><span class="intspan"><input type="text"  id="address" name="address"  size="80"  class="int"/></span></td>
-               </tr>
-               <tr>
-                  <th ><s:Locale code="org.postalcode" />:</th>
-                  <td><span class="intspan"><input type="text"  id="postalCode" name="postalCode"  size="80"  class="int"/></span></td>
-               </tr>
-            </table>
-         		</td></tr>
-         		<tr><td nowrap class="center">
-                              <input id="addChildBtn" class="button"   type="button" style="width:120px"  value="<s:Locale code="button.text.add" />"/>
-                          
-                              <input id="saveBtn" class="button"      type="button"   style="width:100px"  value="<s:Locale code="button.text.save" />"/>
-                           
-                              <input id="deleteBtn"  class="button"   type="button"   style="width:100px"  value="<s:Locale code="button.text.delete" />"/>
-                           
-         		</td></tr>
-         	</table>
-
-         </form>
-      </td>
-   </tr>
-</table>

+ 0 - 0
maxkey-web-manage/src/main/resources/templates/views/orgs/orgsSelect.jsp → maxkey-web-manage/src/main/resources/templates/views/orgs/orgsSelect.ftl


+ 501 - 0
maxkey-web-manage/src/main/resources/templates/views/userinfo/userAdd.ftl

@@ -0,0 +1,501 @@
+<!DOCTYPE HTML>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<#include  "../layout/header.ftl"/>
+	<#include  "../layout/common.cssjs.ftl"/>
+<script type="text/javascript">
+   <!--
+      $(function(){	
+      	$("#picture").on("click",function(){
+      		$("#pictureFile").click();
+      	});
+      });
+      //-->
+</script>
+
+<style   type="text/css">
+  .table th, .table td {
+    padding: .2rem;
+    vertical-align: middle;
+  }
+</style>
+</head>
+<body>
+<form  
+	method="post"
+	type="alert"  
+	action="<@base/>/users/add" 
+	autoclose="true" 
+	enctype="multipart/form-data">
+	 <div class="" style="width:100%;">
+		<div class="top">
+			<ul class="switch_tab"  style="width:100%" >
+				<li id="switch_basic" value="table_switch_basic" style="width:30%" class="switch_tab_class switch_tab_current"><a href="javascript:void(0);"><@locale code="userinfo.tab.basic" /></a></li>
+				<li id="switch_company"  value="table_switch_company" style="width:30%" class="switch_tab_class"><a href="javascript:void(0);"><@locale code="userinfo.tab.business" /></a></li>
+				<li id="switch_home"  value="table_switch_home" style="width:30%" class="switch_tab_class"><a href="javascript:void(0);"><@locale code="userinfo.tab.personal" /></a></li>
+				
+			</ul>
+		</div>
+
+	    <div class="main">
+	    <div class="mainin">			 
+  	        <!-- content -->    
+  	      	<!--table-->
+			 <table id="table_switch_basic" width="980" class="table table-bordered" >
+	<tbody>				
+	<tr>
+		<td style="width:15%;"><@locale code="userinfo.username" />:</td>
+		<td style="width:35%;">
+		<input type="hidden" id="id" name="id" value=""/>
+			<input  class="form-control"  type="text" id="username" name="username"  title="" value=""/>
+		</td>
+		<td style="width:15%;"><@locale code="login.text.password" />:</td>
+		<td style="width:35%;">
+			<input  class="form-control"  type="password" id="password" name="password"  title="" value=""/>
+		</td>
+	</tr>
+	<tr>
+			<td style="width:15%;"><@locale code="userinfo.employeeNumber" />:</td>
+			<td style="width:35%;">
+				<input class="form-control"  type="text" id="employeeNumber" name="employeeNumber"  title="" value=""/>
+			</td>
+			<td><@locale code="userinfo.userType" />:</td>
+			<td style="width:35%;">
+	
+				<select name="userType"   class="form-control" >
+						<option value="EMPLOYEE"  selected><@locale code="userinfo.userType.employee" /></option>
+						<option value="CONTRACTOR"  selected><@locale code="userinfo.userType.contractor" /></option>
+						<option value="CUSTOMER"  selected><@locale code="userinfo.userType.customer" /></option>
+						<option value="DEALER"  selected><@locale code="userinfo.userType.dealer" /></option>
+						<option value="SUPPLIER"  selected><@locale code="userinfo.userType.supplier" /></option>
+						<option value="PARTNER"  selected><@locale code="userinfo.userType.partner" /></option>
+						<option value="EXTERNAL"  selected><@locale code="userinfo.userType.external" /></option>
+						<option value="INTERN"  selected><@locale code="userinfo.userType.intern" /></option>
+						<option value="TEMP"  selected><@locale code="userinfo.userType.temp" /></option>
+				</select>
+			</td>
+			
+		</tr>
+	<tr>
+		<td colspan="4">&nbsp;
+		</td>
+		
+	</tr>
+	<tr>
+		<td><@locale code="userinfo.displayName" />:</td>
+		<td>
+			<input class="form-control"  type="text" id="displayName" name="displayName"  title="" value=""/>
+		</td>
+		<td rowspan="4"><@locale code="userinfo.picture" />:</td>
+		<td rowspan="4">
+			<img id="picture" width="150px" height="150px" src="<@base/>/static/images/uploadimage.jpg" />
+			<input type="file" id="pictureFile" name="pictureFile" style="display:none" />
+					</td>
+	</tr>
+	<tr>
+		<td><@locale code="userinfo.familyName" />:</td>
+		<td>
+			<input class="form-control"  type="text" id="familyName" name="familyName"  title="" value=""/>
+		</td>
+	</tr>
+	<tr>
+		<td><@locale code="userinfo.givenName" />:</td>
+		<td>
+			<input class="form-control"  type="text" id="givenName" name="givenName"  title="" value=""/>
+		</td>
+	</tr>
+	<tr>
+		<td><@locale code="userinfo.middleName" />:</td>
+		<td>
+			<input class="form-control"  type="text" id="middleName" name="middleName"  title="" value=""/>
+		</td>
+		
+		
+	</tr>
+	<tr>
+		<td><@locale code="userinfo.nickName" />:</td>
+		<td>
+			<input class="form-control"  type="text" id="nickName" name="nickName"  title="" value=""/>
+		</td>
+		<td style="width:15%;"><@locale code="userinfo.windowsAccount" />:</td>
+			<td style="width:35%;">
+				<input class="form-control"  type="text" id="windowsAccount" name="windowsAccount"  title="" value=""/>
+		</td>
+	</tr>
+	<tr>
+		<td><@locale code="userinfo.gender" />:</td>
+		<td>
+			<select name="gender"   class="form-control" >
+					<option value="1"  selected><@locale code="userinfo.gender.female" /></option>
+					<option value="2"  ><@locale code="userinfo.gender.male" /></option>
+			</select>
+		</td>
+		<td><@locale code="userinfo.birthDate" />:</td>
+		<td>
+			<input class="form-control"  type="text" id="birthDate" name="birthDate"  title="" value=""/>
+		</td>
+	</tr>
+
+	<tr>
+		<td colspan="4">&nbsp;
+		</td>
+		
+	</tr>
+	<tr>
+		<td><@locale code="userinfo.preferredLanguage" />:</td>
+		<td>
+			<select class="form-control"  name="preferredLanguage" id="preferredLanguage">
+				<option value="" selected="selected">Language</option>
+				<option value="en_US"  >English</option>
+				<option value="nl_NL"  >Dutch</option>
+				<option value="fr"     >French</option>
+				<option value="de"     >German</option>
+				<option value="it"     >Italian</option>
+				<option value="es"     >Spanish</option>
+				<option value="sv"     >Swedish</option>
+				<option value="pt_BR"  >Portuguese  (Brazilian)</option>
+				<option value="ja"     >Japanese</option>
+				<option value="zh_CN" selected >Chinese (Simplified)</option>
+				<option value="zh_TW"  >Chinese (Traditional)</option>
+				<option value="ko"     >Korean</option>
+				<option value="th"     >Thai</option>
+				<option value="fi"     >Finnish</option>
+				<option value="ru"     >Russian</option>
+			</select>
+		</td>
+		<td><@locale code="userinfo.timeZone" />:</td>
+		<td nowrap >
+			<select class="form-control"  id="timeZone" name="timeZone" tabindex="61">
+				<option value="Pacific/Kiritimati"   >(GMT+14:00) Line Islands Time (Pacific/Kiritimati)</option>
+				<option value="Pacific/Chatham"      >(GMT+13:45) Chatham Daylight Time (Pacific/Chatham)</option>
+				<option value="Pacific/Auckland"     >(GMT+13:00) New Zealand Daylight Time (Pacific/Auckland)</option>
+				<option value="Pacific/Enderbury"    >(GMT+13:00) Phoenix Islands Time (Pacific/Enderbury)</option>
+				<option value="Pacific/Tongatapu"    >(GMT+13:00) Tonga Time (Pacific/Tongatapu)</option>
+				<option value="Asia/Kamchatka"       >(GMT+12:00) Magadan Time (Asia/Kamchatka)</option>
+				<option value="Pacific/Fiji"         >(GMT+12:00) Fiji Time (Pacific/Fiji)</option>
+				<option value="Pacific/Norfolk"      >(GMT+11:30) Norfolk Islands Time (Pacific/Norfolk)</option>
+				<option value="Australia/Lord_Howe"  >(GMT+11:00) Lord Howe Daylight Time (Australia/Lord_Howe)</option>
+				<option value="Australia/Sydney"     >(GMT+11:00) Australian Eastern Daylight Time (Australia/Sydney)</option>
+				<option value="Pacific/Guadalcanal"  >(GMT+11:00) Solomon Islands Time (Pacific/Guadalcanal)</option>
+				<option value="Australia/Adelaide"   >(GMT+10:30) Australian Central Daylight Time (Australia/Adelaide)</option>
+				<option value="Australia/Brisbane"   >(GMT+10:00) Australian Eastern Standard Time (Australia/Brisbane)</option>
+				<option value="Australia/Darwin"     >(GMT+09:30) Australian Central Standard Time (Australia/Darwin)</option>
+				<option value="Asia/Seoul"           >(GMT+09:00) Korean Standard Time (Asia/Seoul)</option>
+				<option value="Asia/Tokyo"           >(GMT+09:00) Japan Standard Time (Asia/Tokyo)</option>
+				<option value="Asia/Hong_Kong"       >(GMT+08:00) Hong Kong Time (Asia/Hong_Kong)</option>
+				<option value="Asia/Kuala_Lumpur"    >(GMT+08:00) Malaysia Time (Asia/Kuala_Lumpur)</option>
+				<option value="Asia/Manila"          >(GMT+08:00) Philippine Time (Asia/Manila)</option>
+				<option value="Asia/Shanghai" selected >(GMT+08:00) China Standard Time (Asia/Shanghai)</option>
+				<option value="Asia/Singapore"       >(GMT+08:00) Singapore Standard Time (Asia/Singapore)</option>
+				<option value="Asia/Taipei"          >(GMT+08:00) Taipei Standard Time (Asia/Taipei)</option>
+				<option value="Australia/Perth"      >(GMT+08:00) Australian Western Standard Time (Australia/Perth)</option>
+				<option value="Asia/Bangkok"         >(GMT+07:00) Indochina Time (Asia/Bangkok)</option>
+				<option value="Asia/Ho_Chi_Minh"     >(GMT+07:00) Indochina Time (Asia/Ho_Chi_Minh)</option>
+				<option value="Asia/Jakarta"         >(GMT+07:00) Western Indonesia Time (Asia/Jakarta)</option>
+				<option value="Asia/Rangoon"         >(GMT+06:30) Myanmar Time (Asia/Rangoon)</option>
+				<option value="Asia/Dhaka"           >(GMT+06:00) Bangladesh Time (Asia/Dhaka)</option>
+				<option value="Asia/Yekaterinburg"   >(GMT+06:00) Yekaterinburg Time (Asia/Yekaterinburg)</option>
+				<option value="Asia/Kathmandu"       >(GMT+05:45) Nepal Time (Asia/Kathmandu)</option>
+				<option value="Asia/Colombo"         >(GMT+05:30) India Standard Time (Asia/Colombo)</option>
+				<option value="Asia/Kolkata"         >(GMT+05:30) India Standard Time (Asia/Kolkata)</option>
+				<option value="Asia/Baku"            >(GMT+05:00) Azerbaijan Summer Time (Asia/Baku)</option>
+				<option value="Asia/Karachi"         >(GMT+05:00) Pakistan Time (Asia/Karachi)</option>
+				<option value="Asia/Tashkent"        >(GMT+05:00) Uzbekistan Time (Asia/Tashkent)</option>
+				<option value="Asia/Kabul"           >(GMT+04:30) Afghanistan Time (Asia/Kabul)</option>
+				<option value="Asia/Dubai"           >(GMT+04:00) Gulf Standard Time (Asia/Dubai)</option>
+				<option value="Asia/Tbilisi"         >(GMT+04:00) Georgia Time (Asia/Tbilisi)</option>
+				<option value="Asia/Yerevan"         >(GMT+04:00) Armenia Time (Asia/Yerevan)</option>
+				<option value="Europe/Moscow"        >(GMT+04:00) Moscow Standard Time (Europe/Moscow)</option>
+				<option value="Asia/Tehran"          >(GMT+03:30) Iran Standard Time (Asia/Tehran)</option>
+				<option value="Africa/Nairobi"       >(GMT+03:00) East Africa Time (Africa/Nairobi)</option>
+				<option value="Asia/Baghdad"         >(GMT+03:00) Arabian Standard Time (Asia/Baghdad)</option>
+				<option value="Asia/Beirut"          >(GMT+03:00) Eastern European Summer Time (Asia/Beirut)</option>
+				<option value="Asia/Jerusalem"       >(GMT+03:00) Israel Daylight Time (Asia/Jerusalem)</option>
+				<option value="Asia/Kuwait"          >(GMT+03:00) Arabian Standard Time (Asia/Kuwait)</option>
+				<option value="Asia/Riyadh"          >(GMT+03:00) Arabian Standard Time (Asia/Riyadh)</option>
+				<option value="Europe/Athens"        >(GMT+03:00) Eastern European Summer Time (Europe/Athens)</option>
+				<option value="Europe/Bucharest"     >(GMT+03:00) Eastern European Summer Time (Europe/Bucharest)</option>
+				<option value="Europe/Helsinki"      >(GMT+03:00) Eastern European Summer Time (Europe/Helsinki)</option>
+				<option value="Europe/Istanbul"      >(GMT+03:00) Eastern European Summer Time (Europe/Istanbul)</option>
+				<option value="Europe/Minsk"         >(GMT+03:00) Further-eastern European Time (Europe/Minsk)</option>
+				<option value="Africa/Cairo"         >(GMT+02:00) Eastern European Time (Africa/Cairo)</option>
+				<option value="Africa/Johannesburg"  >(GMT+02:00) South Africa Standard Time (Africa/Johannesburg)</option>
+				<option value="Europe/Amsterdam"     >(GMT+02:00) Central European Summer Time (Europe/Amsterdam)</option>
+				<option value="Europe/Berlin"        >(GMT+02:00) Central European Summer Time (Europe/Berlin)</option>
+				<option value="Europe/Brussels"      >(GMT+02:00) Central European Summer Time (Europe/Brussels)</option>
+				<option value="Europe/Paris"         >(GMT+02:00) Central European Summer Time (Europe/Paris)</option>
+				<option value="Europe/Prague"        >(GMT+02:00) Central European Summer Time (Europe/Prague)</option>
+				<option value="Europe/Rome"          >(GMT+02:00) Central European Summer Time (Europe/Rome)</option>
+				<option value="Africa/Algiers"       >(GMT+01:00) Central European Time (Africa/Algiers)</option>
+				<option value="Europe/Dublin"        >(GMT+01:00) Irish Summer Time (Europe/Dublin)</option>
+				<option value="Europe/Lisbon"        >(GMT+01:00) Western European Summer Time (Europe/Lisbon)</option>
+				<option value="Europe/London"        >(GMT+01:00) British Summer Time (Europe/London)</option>
+				<option value="Africa/Casablanca"    >(GMT+00:00) Western European Time (Africa/Casablanca)</option>
+				<option value="America/Scoresbysund" >(GMT+00:00) East Greenland Summer Time (America/Scoresbysund)</option>
+				<option value="Atlantic/Azores"      >(GMT+00:00) Azores Summer Time (Atlantic/Azores)</option>
+				<option value="GMT"                  >(GMT+00:00) Greenwich Mean Time (GMT)</option>
+				<option value="Atlantic/Cape_Verde"  >(GMT-01:00) Cape Verde Time (Atlantic/Cape_Verde)</option>
+				<option value="Atlantic/South_Georgia" >(GMT-02:00) South Georgia Time (Atlantic/South_Georgia)</option>
+				<option value="America/St_Johns"      >(GMT-02:30) Newfoundland Daylight Time (America/St_Johns)</option>
+				<option value="America/Argentina/Buenos_Aires" >(GMT-03:00) Argentina Time (America/Argentina/Buenos_Aires)</option>
+				<option value="America/Halifax"      >(GMT-03:00) Atlantic Daylight Time (America/Halifax)</option>
+				<option value="America/Santiago"     >(GMT-03:00) Chile Summer Time (America/Santiago)</option>
+				<option value="America/Sao_Paulo"    >(GMT-03:00) Brasilia Time (America/Sao_Paulo)</option>
+				<option value="Atlantic/Bermuda"     >(GMT-03:00) Atlantic Daylight Time (Atlantic/Bermuda)</option>
+				<option value="America/Indiana/Indianapolis" >(GMT-04:00) Eastern Daylight Time (America/Indiana/Indianapolis)</option>
+				<option value="America/New_York"     >(GMT-04:00) Eastern Daylight Time (America/New_York)</option>
+				<option value="America/Puerto_Rico"  >(GMT-04:00) Atlantic Standard Time (America/Puerto_Rico)</option>
+				<option value="America/Caracas"      >(GMT-04:30) Venezuela Time (America/Caracas)</option>
+				<option value="America/Bogota"       >(GMT-05:00) Colombia Time (America/Bogota)</option>
+				<option value="America/Chicago"      >(GMT-05:00) Central Daylight Time (America/Chicago)</option>
+				<option value="America/Lima"         >(GMT-05:00) Peru Time (America/Lima)</option>
+				<option value="America/Mexico_City"  >(GMT-05:00) Central Daylight Time (America/Mexico_City)</option>
+				<option value="America/Panama"       >(GMT-05:00) Eastern Standard Time (America/Panama)</option>
+				<option value="America/Denver"       >(GMT-06:00) Mountain Daylight Time (America/Denver)</option>
+				<option value="America/El_Salvador"  >(GMT-06:00) Central Standard Time (America/El_Salvador)</option>
+				<option value="America/Mazatlan"     >(GMT-06:00) Mountain Daylight Time (America/Mazatlan)</option>
+				<option value="America/Los_Angeles"  >(GMT-07:00) Pacific Daylight Time (America/Los_Angeles)</option>
+				<option value="America/Phoenix"      >(GMT-07:00) Mountain Standard Time (America/Phoenix)</option>
+				<option value="America/Tijuana"      >(GMT-07:00) Pacific Daylight Time (America/Tijuana)</option>
+				<option value="America/Anchorage"    >(GMT-08:00) Alaska Daylight Time (America/Anchorage)</option>
+				<option value="Pacific/Pitcairn"     >(GMT-08:00) Pitcairn Time (Pacific/Pitcairn)</option>
+				<option value="America/Adak"         >(GMT-09:00) Hawaii-Aleutian Standard Time (America/Adak)</option>
+				<option value="Pacific/Gambier"      >(GMT-09:00) Gambier Time (Pacific/Gambier)</option>
+				<option value="Pacific/Marquesas"    >(GMT-09:30) Marquesas Time (Pacific/Marquesas)</option>
+				<option value="Pacific/Honolulu"     >(GMT-10:00) Hawaii-Aleutian Standard Time (Pacific/Honolulu)</option>
+				<option value="Pacific/Niue"         >(GMT-11:00) Niue Time (Pacific/Niue)</option>
+				<option value="Pacific/Pago_Pago"    >(GMT-11:00) Samoa Standard Time (Pacific/Pago_Pago)</option>
+			</select>
+		</td>
+	</tr>
+	</tbody>
+ </table>
+ <table  class="table table-bordered"  style="display:none" id="table_switch_company" width="980">
+	<tbody>				
+		<tr>
+			<td style="width:15%;"><@locale code="userinfo.organization" />:</td>
+			<td style="width:35%;">
+				<input class="form-control"  type="text" id="organization" name="organization"  title="" value=""/>
+			</td>
+			<td style="width:15%;"><@locale code="userinfo.division" />:</td>
+			<td style="width:35%;">
+				<input class="form-control"  type="text" id="division" name="division"  title="" value=""/>
+			</td>
+			
+		</tr>
+		
+		<tr>
+			<td><@locale code="userinfo.department" />:</td>
+			<td>
+				<input class="form-control"  type="hidden" id="departmentId" name="departmentId"  title="" value=""/>
+				<input class="form-control"  type="text" style="width:70%"  id="department" name="department"  title="" value=""/>
+				<s:Dialog text="button.text.select" title="department" url="/orgs/orgsSelect/deptId/department" width="300" height="400" />
+			</td>
+			<td><@locale code="userinfo.costCenter" />:</td>
+			<td>
+				<input class="form-control"  type="text" id="costCenter" name="costCenter"  title="" value=""/>
+			</td>
+			
+		</tr>
+		<tr>
+			<td><@locale code="userinfo.jobTitle" />:</td>
+			<td>
+				<input class="form-control"  type="text" id="jobTitle" name="jobTitle"  title="" value=""/>
+			</td>
+			<td><@locale code="userinfo.jobLevel" />:</td>
+			<td>
+				<input class="form-control"  type="text" id="jobLevel" name="jobLevel"  title="" value=""/>
+			</td>
+		</tr>
+		<tr>
+			<td><@locale code="userinfo.manager" />:</td>
+			<td>
+				<input class="form-control"  type="hidden" id="managerId" name="managerId"  title="" value=""/>
+				<input class="form-control"  type="text" id="manager" name="manager"  title="" value=""/>
+			</td>
+			<td><@locale code="userinfo.assistant" />:</td>
+			<td>
+				<input class="form-control"  type="hidden" id="assistantId" name="assistantId"  title="" value=""/>
+				<input class="form-control"   type="text" id="assistant" name="assistant"  title="" value=""/>
+			</td>
+		</tr>
+		<tr>
+			<td><@locale code="userinfo.entryDate" />:</td>
+			<td>
+				<input class="form-control"  type="text" id="entryDate" name="entryDate"  title="" value=""/>
+			</td>
+			<td><@locale code="userinfo.quitDate" />:</td>
+			<td>
+				<input class="form-control"   type="text" id="quitDate" name="quitDate"  title="" value=""/>
+			</td>
+		</tr>
+		<tr>
+			<td colspan="4">&nbsp;
+			</td>
+			
+		</tr>
+		<tr>
+			<td><@locale code="userinfo.workCountry" />:</td>
+			<td nowrap >
+				<input class="form-control"   type="text" id="workCountry" name="workCountry"  title="" value=""/>
+			</td>
+			<td><@locale code="userinfo.workRegion" />:</td>
+			<td>
+				<input class="form-control"  type="text" id="workRegion" name="workRegion"  title="" value=""/>
+			</td>
+		</tr>
+		<tr>
+			<td><@locale code="userinfo.workLocality" />:</td>
+			<td>
+				<input class="form-control"  type="text" id="workLocality" name="workLocality"  title="" value=""/>
+			</td>
+			<td><@locale code="userinfo.workStreetAddress" />:</td>
+			<td>
+				<input class="form-control"  type="text" id="workStreetAddress" name="workStreetAddress"  title="" value=""/>
+			</td>
+		</tr>
+		<tr>
+			
+			<td><@locale code="userinfo.workPostalCode" />:</td>
+			<td>
+				<input class="form-control"  type="text" id="workPostalCode" name="workPostalCode"  title="" value=""/>
+			</td>
+			<td><@locale code="userinfo.workFax" />:</td>
+			<td>
+				<input class="form-control"  type="text" id="workFax" name="workFax"  title="" value=""/>
+			</td>
+		</tr>
+
+		<tr>
+			<td><@locale code="userinfo.workPhoneNumber" />:</td>
+			<td>
+				<input class="form-control"  type="text" id="workPhoneNumber" name="workPhoneNumber"  title="" value=""/>
+			</td>
+			<td><@locale code="userinfo.workEmail" />:</td>
+			<td>
+				<input class="form-control"  type="text" id="workEmail" name="workEmail"  title="" value=""/>
+			</td>
+		</tr>
+		<tr>
+			<td colspan="4">&nbsp;
+			</td>
+			
+		</tr>					
+	</tbody>
+</table>
+<table  class="table table-bordered"  style="display:none" id="table_switch_home" width="980">
+	<tbody>				
+		<tr>
+			<td style="width:15%;"><@locale code="userinfo.idtype" />:</td>
+			<td style="width:35%;">
+				<select name="idType"   class="form-control" >
+					<option value="UNKNOWN" selected ><@locale code="userinfo.idtype.unknown" /></option>
+					<option value="IDCARD"  ><@locale code="userinfo.idtype.idcard" /></option>
+					<option value="PASSPORT"  ><@locale code="userinfo.idtype.passport" /></option>
+					<option value="STUDENTCARD"  ><@locale code="userinfo.idtype.studentcard" /></option>
+					<option value="MILITARYCARD"  ><@locale code="userinfo.idtype.militarycard" /></option>
+				</select>
+			</td>
+			
+			<td style="width:15%;"><@locale code="userinfo.idCardNo" />:</td>
+			<td style="width:35%;">
+				<input class="form-control"  type="text" id="idCardNo" name="idCardNo"  title="" value=""/>
+
+			</td>
+		</tr>
+		<tr>
+			
+			<td><@locale code="userinfo.married" />:</td>
+			<td>
+				<select name="married"  class="form-control" >
+					<option value="UNKNOWN" selected><@locale code="userinfo.married.unknown" /></option>
+					<option value="SINGLE" ><@locale code="userinfo.married.single" /></option>
+					<option value="MARRIED" ><@locale code="userinfo.married.married" /></option>
+					<option value="DIVORCE" ><@locale code="userinfo.married.divorce" /></option>
+					<option value="WIDOWED" ><@locale code="userinfo.married.widowed" /></option>
+				</select>
+			</td>
+			<td><@locale code="userinfo.startWorkDate" />:</td>
+			<td>
+				<input class="form-control"  type="text" id="startWorkDate" name="startWorkDate"  title="" value=""/>
+			</td>
+		</tr>
+		<tr>
+			<td colspan="4">&nbsp;
+			</td>
+			
+		</tr>
+		
+		<tr>
+			<td><@locale code="userinfo.homeCountry" />:</td>
+			<td>
+				<input class="form-control"  type="text" id="homeCountry" name="homeCountry"  title="" value=""/>
+			</td>
+			<td><@locale code="userinfo.homeRegion" />:</td>
+			<td>
+				<input class="form-control"  type="text" id="homeRegion" name="homeRegion"  title="" value=""/>
+			</td>
+		</tr>
+		<tr>
+			
+			<td><@locale code="userinfo.homeLocality" />:</td>
+			<td>
+				<input class="form-control"  type="text" id="homeLocality" name="homeLocality"  title="" value=""/>
+			</td>
+			<td><@locale code="userinfo.homeStreetAddress" />:</td>
+			<td>
+				<input class="form-control"  type="text" id="homeStreetAddress" name="homeStreetAddress"  title="" value=""/>
+			</td>
+		</tr>
+		<tr>
+			
+			<td><@locale code="userinfo.homePostalCode" />:</td>
+			<td>
+				<input class="form-control"  type="text" id="homePostalCode" name="homePostalCode"  title="" value=""/>
+			</td>
+			<td><@locale code="userinfo.homeFax" />:</td>
+			<td>
+				<input class="form-control"  type="text" id="homeFax" name="homeFax"  title="" value=""/>
+			</td>
+		</tr>
+		
+		<tr>
+			<td><@locale code="userinfo.homePhoneNumber" />:</td>
+			<td>
+				<input class="form-control"  type="text" id="homePhoneNumber" name="homePhoneNumber"  title="" value=""/>
+			</td>
+			<td><@locale code="userinfo.homeEmail" />:</td>
+			<td >
+				<input class="form-control"  type="text" id="homeEmail" name="homeEmail"  title="" value=""/>
+			</td>
+		</tr>
+		<tr>
+			<td colspan="4">&nbsp;
+			</td>
+			
+		</tr>
+				<tr>
+					<td><@locale code="userinfo.website" />:</td>
+					<td>
+						<input  class="form-control"   type="text" id="webSite" name="webSite"  title="" value=""/>
+					</td>
+					<td><@locale code="userinfo.ims" />:</td>
+					<td >
+						<input class="form-control"  type="text" id="defineIm" name="defineIm"  title="" value=""/>
+					</td>
+				</tr>
+	</tbody>
+</table>
+  	        <div class="clear"></div>
+		</div>
+		</div>
+			<div >
+				<div >
+					<input id="_method" type="hidden" name="_method"  value="post"/>
+					<input id="submitBtn" class="button btn btn-primary mr-3" type="button" value="<@locale code="button.text.save" />"/>
+				</div>
+			</div>
+	 </div> 
+</form>
+</body>
+</html>

+ 0 - 51
maxkey-web-manage/src/main/resources/templates/views/userinfo/userAdd.jsp

@@ -1,51 +0,0 @@
-<%@ page   language="java"    import="java.util.*"   pageEncoding="UTF-8"%>
-<%@ taglib prefix="s"  uri="http://www.connsec.com/tags" %>
-<%@ taglib prefix="spring"	  uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="fmt"		  uri="http://java.sun.com/jsp/jstl/fmt"%>
-<%@ taglib prefix="c"		  uri="http://java.sun.com/jsp/jstl/core" %>
-<script type="text/javascript">
-   <!--
-      $(function(){	
-      	$("#picture").on("click",function(){
-      		$("#pictureFile").click();
-      	});
-      });
-      //-->
-</script>
-
-<form  
-	method="post"
-	type="alert"  
-	action="<s:Base/>/users/add" 
-	autoclose="true" 
-	enctype="multipart/form-data">
-	 <div class="" style="width:100%;">
-		<div class="top">
-			<ul class="switch_tab"  style="width:100%" >
-				<li id="switch_basic" value="table_switch_basic" style="width:24%" class="switch_tab_class switch_tab_current"><a href="javascript:void(0);"><s:Locale code="userinfo.tab.basic" /></a></li>
-				<li id="switch_company"  value="table_switch_company" style="width:24%" class="switch_tab_class"><a href="javascript:void(0);"><s:Locale code="userinfo.tab.business" /></a></li>
-				<li id="switch_home"  value="table_switch_home" style="width:24%" class="switch_tab_class"><a href="javascript:void(0);"><s:Locale code="userinfo.tab.personal" /></a></li>
-				<li id="switch_extra"  value="table_switch_extra" style="width:24%" class="switch_tab_class"><a href="javascript:void(0);"><s:Locale code="userinfo.tab.extra" /></a></li>
-			
-			</ul>
-		</div>
-
-	    <div class="main">
-	    <div class="mainin">			 
-  	        <!-- content -->    
-  	      	<!--table-->
-			 <%@ include file="userAddBasic.jsp"%> 
-			 <%@ include file="userAddCompany.jsp"%> 
-			 <%@ include file="userAddHome.jsp"%> 
-  	        <div class="clear"></div>
-		</div>
-		</div>
-			<div >
-				<div >
-					<input id="_method" type="hidden" name="_method"  value="post"/>
-					<input id="submitBtn" class="button" type="submit" value="<s:Locale code="button.text.save" />"/>
-					<input id="closeBtn"  class="button"  type="button" value="<s:Locale code="button.text.cancel" />"/>		  
-				</div>
-			</div>
-	 </div> 
-</form>

+ 0 - 250
maxkey-web-manage/src/main/resources/templates/views/userinfo/userAddBasic.jsp

@@ -1,250 +0,0 @@
-<%@ page   language="java"    import="java.util.*"   pageEncoding="UTF-8"%>
-<%@ taglib prefix="s"  uri="http://www.connsec.com/tags" %>
-<%@ taglib prefix="spring"	  uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="fmt"		  uri="http://java.sun.com/jsp/jstl/fmt"%>
-<%@ taglib prefix="c"		  uri="http://java.sun.com/jsp/jstl/core" %>
-
-			  
- <table id="table_switch_basic" width="980" class="datatable" >
-	<tbody>				
-	<tr>
-		<th style="width:15%;"><s:Locale code="userinfo.username" />:</th>
-		<td style="width:35%;">
-		<input type="hidden" id="id" name="id" value=""/>
-			<input type="text" id="username" name="username"  title="" value=""/>
-			<b class="orange">*</b><label for="username"></label>
-		</td>
-		<th style="width:15%;"><s:Locale code="userinfo.password" />:</th>
-		<td style="width:35%;">
-			<input type="password" id="password" name="password"  title="" value=""/>
-			<b class="orange">*</b><label for="password"></label>
-		</td>
-	</tr>
-	<tr>
-		<td colspan="4">&nbsp;
-		</td>
-		
-	</tr>
-	<tr>
-		<th><s:Locale code="userinfo.displayName" />:</th>
-		<td>
-			<input type="text" id="displayName" name="displayName"  title="" value=""/>
-			<b class="orange">*</b><label for="displayName"></label>
-		</td>
-		<th rowspan="4"><s:Locale code="userinfo.picture" />:</th>
-		<td rowspan="4">
-			<img id="picture" width="150px" height="150px" src="<c:url value="/images/uploadimage.jpg"/>" />
-			<input type="file" id="pictureFile" name="pictureFile" style="display:none" />
-					</td>
-	</tr>
-	<tr>
-		<th><s:Locale code="userinfo.familyName" />:</th>
-		<td>
-			<input type="text" id="familyName" name="familyName"  title="" value=""/>
-			<b class="orange">*</b><label for="familyName"></label>
-		</td>
-	</tr>
-	<tr>
-		<th><s:Locale code="userinfo.givenName" />:</th>
-		<td>
-			<input type="text" id="givenName" name="givenName"  title="" value=""/>
-			<b class="orange">*</b><label for="givenName"></label>
-		</td>
-	</tr>
-	<tr>
-		<th><s:Locale code="userinfo.middleName" />:</th>
-		<td>
-			<input type="text" id="middleName" name="middleName"  title="" value=""/><label for="middleName"></label>
-		</td>
-		
-		
-	</tr>
-	<tr>
-		<th><s:Locale code="userinfo.nickName" />:</th>
-		<td>
-			<input type="text" id="nickName" name="nickName"  title="" value=""/><label for="nickName"></label>
-		</td>
-		<th><s:Locale code="userinfo.userType" />:</th>
-		<td style="width:35%;">
-				<c:forEach items="${userTypeList}" var="userType">
-					<c:if test="${userTypeId  eq userType.id}">
-					<input readonly type="text" id="userType" name="userType"  title="" value="${userType.id}" style="display:none" />
-					<input readonly type="text" id="userType" name="userTypeName"  title="" value="${userType.name}"/></c:if>
-		      	</c:forEach>
-		</td>
-	</tr>
-	<tr>
-		<th><s:Locale code="userinfo.gender" />:</th>
-		<td>
-			<select name="gender"  class="gender">
-					<option value="1"  selected><s:Locale code="userinfo.gender.female" /></option>
-					<option value="2"  ><s:Locale code="userinfo.gender.male" /></option>
-			</select><label for="gender"></label>
-		</td>
-		<th><s:Locale code="userinfo.birthDate" />:</th>
-		<td>
-			<input type="text" id="birthDate" name="birthDate"  title="" value=""/><label for="birthDate"></label>
-		</td>
-	</tr>
-
-	<tr>
-		<td colspan="4">&nbsp;
-		</td>
-		
-	</tr>
-	<tr>
-		<th><s:Locale code="userinfo.webSite" />:</th>
-		<td>
-			<input type="text" id="webSite" name="webSite"  title="" value=""/><label for="webSite"></label>
-		</td>
-		<th><s:Locale code="userinfo.preferredLanguage" />:</th>
-		<td>
-			<select name="preferredLanguage" id="preferredLanguage">
-				<option value="" selected="selected">Language</option>
-				<option value="en_US"  >English</option>
-				<option value="nl_NL"  >Dutch</option>
-				<option value="fr"     >French</option>
-				<option value="de"     >German</option>
-				<option value="it"     >Italian</option>
-				<option value="es"     >Spanish</option>
-				<option value="sv"     >Swedish</option>
-				<option value="pt_BR"  >Portuguese  (Brazilian)</option>
-				<option value="ja"     >Japanese</option>
-				<option value="zh_CN" selected >Chinese (Simplified)</option>
-				<option value="zh_TW"  >Chinese (Traditional)</option>
-				<option value="ko"     >Korean</option>
-				<option value="th"     >Thai</option>
-				<option value="fi"     >Finnish</option>
-				<option value="ru"     >Russian</option>
-			</select>
-		</td>
-	</tr>
-	<tr>
-		<th><s:Locale code="userinfo.timeZone" />:</th>
-		<td nowrap >
-			<select id="timeZone" name="timeZone" tabindex="61">
-				<option value="Pacific/Kiritimati"   >(GMT+14:00) Line Islands Time (Pacific/Kiritimati)</option>
-				<option value="Pacific/Chatham"      >(GMT+13:45) Chatham Daylight Time (Pacific/Chatham)</option>
-				<option value="Pacific/Auckland"     >(GMT+13:00) New Zealand Daylight Time (Pacific/Auckland)</option>
-				<option value="Pacific/Enderbury"    >(GMT+13:00) Phoenix Islands Time (Pacific/Enderbury)</option>
-				<option value="Pacific/Tongatapu"    >(GMT+13:00) Tonga Time (Pacific/Tongatapu)</option>
-				<option value="Asia/Kamchatka"       >(GMT+12:00) Magadan Time (Asia/Kamchatka)</option>
-				<option value="Pacific/Fiji"         >(GMT+12:00) Fiji Time (Pacific/Fiji)</option>
-				<option value="Pacific/Norfolk"      >(GMT+11:30) Norfolk Islands Time (Pacific/Norfolk)</option>
-				<option value="Australia/Lord_Howe"  >(GMT+11:00) Lord Howe Daylight Time (Australia/Lord_Howe)</option>
-				<option value="Australia/Sydney"     >(GMT+11:00) Australian Eastern Daylight Time (Australia/Sydney)</option>
-				<option value="Pacific/Guadalcanal"  >(GMT+11:00) Solomon Islands Time (Pacific/Guadalcanal)</option>
-				<option value="Australia/Adelaide"   >(GMT+10:30) Australian Central Daylight Time (Australia/Adelaide)</option>
-				<option value="Australia/Brisbane"   >(GMT+10:00) Australian Eastern Standard Time (Australia/Brisbane)</option>
-				<option value="Australia/Darwin"     >(GMT+09:30) Australian Central Standard Time (Australia/Darwin)</option>
-				<option value="Asia/Seoul"           >(GMT+09:00) Korean Standard Time (Asia/Seoul)</option>
-				<option value="Asia/Tokyo"           >(GMT+09:00) Japan Standard Time (Asia/Tokyo)</option>
-				<option value="Asia/Hong_Kong"       >(GMT+08:00) Hong Kong Time (Asia/Hong_Kong)</option>
-				<option value="Asia/Kuala_Lumpur"    >(GMT+08:00) Malaysia Time (Asia/Kuala_Lumpur)</option>
-				<option value="Asia/Manila"          >(GMT+08:00) Philippine Time (Asia/Manila)</option>
-				<option value="Asia/Shanghai" selected >(GMT+08:00) China Standard Time (Asia/Shanghai)</option>
-				<option value="Asia/Singapore"       >(GMT+08:00) Singapore Standard Time (Asia/Singapore)</option>
-				<option value="Asia/Taipei"          >(GMT+08:00) Taipei Standard Time (Asia/Taipei)</option>
-				<option value="Australia/Perth"      >(GMT+08:00) Australian Western Standard Time (Australia/Perth)</option>
-				<option value="Asia/Bangkok"         >(GMT+07:00) Indochina Time (Asia/Bangkok)</option>
-				<option value="Asia/Ho_Chi_Minh"     >(GMT+07:00) Indochina Time (Asia/Ho_Chi_Minh)</option>
-				<option value="Asia/Jakarta"         >(GMT+07:00) Western Indonesia Time (Asia/Jakarta)</option>
-				<option value="Asia/Rangoon"         >(GMT+06:30) Myanmar Time (Asia/Rangoon)</option>
-				<option value="Asia/Dhaka"           >(GMT+06:00) Bangladesh Time (Asia/Dhaka)</option>
-				<option value="Asia/Yekaterinburg"   >(GMT+06:00) Yekaterinburg Time (Asia/Yekaterinburg)</option>
-				<option value="Asia/Kathmandu"       >(GMT+05:45) Nepal Time (Asia/Kathmandu)</option>
-				<option value="Asia/Colombo"         >(GMT+05:30) India Standard Time (Asia/Colombo)</option>
-				<option value="Asia/Kolkata"         >(GMT+05:30) India Standard Time (Asia/Kolkata)</option>
-				<option value="Asia/Baku"            >(GMT+05:00) Azerbaijan Summer Time (Asia/Baku)</option>
-				<option value="Asia/Karachi"         >(GMT+05:00) Pakistan Time (Asia/Karachi)</option>
-				<option value="Asia/Tashkent"        >(GMT+05:00) Uzbekistan Time (Asia/Tashkent)</option>
-				<option value="Asia/Kabul"           >(GMT+04:30) Afghanistan Time (Asia/Kabul)</option>
-				<option value="Asia/Dubai"           >(GMT+04:00) Gulf Standard Time (Asia/Dubai)</option>
-				<option value="Asia/Tbilisi"         >(GMT+04:00) Georgia Time (Asia/Tbilisi)</option>
-				<option value="Asia/Yerevan"         >(GMT+04:00) Armenia Time (Asia/Yerevan)</option>
-				<option value="Europe/Moscow"        >(GMT+04:00) Moscow Standard Time (Europe/Moscow)</option>
-				<option value="Asia/Tehran"          >(GMT+03:30) Iran Standard Time (Asia/Tehran)</option>
-				<option value="Africa/Nairobi"       >(GMT+03:00) East Africa Time (Africa/Nairobi)</option>
-				<option value="Asia/Baghdad"         >(GMT+03:00) Arabian Standard Time (Asia/Baghdad)</option>
-				<option value="Asia/Beirut"          >(GMT+03:00) Eastern European Summer Time (Asia/Beirut)</option>
-				<option value="Asia/Jerusalem"       >(GMT+03:00) Israel Daylight Time (Asia/Jerusalem)</option>
-				<option value="Asia/Kuwait"          >(GMT+03:00) Arabian Standard Time (Asia/Kuwait)</option>
-				<option value="Asia/Riyadh"          >(GMT+03:00) Arabian Standard Time (Asia/Riyadh)</option>
-				<option value="Europe/Athens"        >(GMT+03:00) Eastern European Summer Time (Europe/Athens)</option>
-				<option value="Europe/Bucharest"     >(GMT+03:00) Eastern European Summer Time (Europe/Bucharest)</option>
-				<option value="Europe/Helsinki"      >(GMT+03:00) Eastern European Summer Time (Europe/Helsinki)</option>
-				<option value="Europe/Istanbul"      >(GMT+03:00) Eastern European Summer Time (Europe/Istanbul)</option>
-				<option value="Europe/Minsk"         >(GMT+03:00) Further-eastern European Time (Europe/Minsk)</option>
-				<option value="Africa/Cairo"         >(GMT+02:00) Eastern European Time (Africa/Cairo)</option>
-				<option value="Africa/Johannesburg"  >(GMT+02:00) South Africa Standard Time (Africa/Johannesburg)</option>
-				<option value="Europe/Amsterdam"     >(GMT+02:00) Central European Summer Time (Europe/Amsterdam)</option>
-				<option value="Europe/Berlin"        >(GMT+02:00) Central European Summer Time (Europe/Berlin)</option>
-				<option value="Europe/Brussels"      >(GMT+02:00) Central European Summer Time (Europe/Brussels)</option>
-				<option value="Europe/Paris"         >(GMT+02:00) Central European Summer Time (Europe/Paris)</option>
-				<option value="Europe/Prague"        >(GMT+02:00) Central European Summer Time (Europe/Prague)</option>
-				<option value="Europe/Rome"          >(GMT+02:00) Central European Summer Time (Europe/Rome)</option>
-				<option value="Africa/Algiers"       >(GMT+01:00) Central European Time (Africa/Algiers)</option>
-				<option value="Europe/Dublin"        >(GMT+01:00) Irish Summer Time (Europe/Dublin)</option>
-				<option value="Europe/Lisbon"        >(GMT+01:00) Western European Summer Time (Europe/Lisbon)</option>
-				<option value="Europe/London"        >(GMT+01:00) British Summer Time (Europe/London)</option>
-				<option value="Africa/Casablanca"    >(GMT+00:00) Western European Time (Africa/Casablanca)</option>
-				<option value="America/Scoresbysund" >(GMT+00:00) East Greenland Summer Time (America/Scoresbysund)</option>
-				<option value="Atlantic/Azores"      >(GMT+00:00) Azores Summer Time (Atlantic/Azores)</option>
-				<option value="GMT"                  >(GMT+00:00) Greenwich Mean Time (GMT)</option>
-				<option value="Atlantic/Cape_Verde"  >(GMT-01:00) Cape Verde Time (Atlantic/Cape_Verde)</option>
-				<option value="Atlantic/South_Georgia" >(GMT-02:00) South Georgia Time (Atlantic/South_Georgia)</option>
-				<option value="America/St_Johns"      >(GMT-02:30) Newfoundland Daylight Time (America/St_Johns)</option>
-				<option value="America/Argentina/Buenos_Aires" >(GMT-03:00) Argentina Time (America/Argentina/Buenos_Aires)</option>
-				<option value="America/Halifax"      >(GMT-03:00) Atlantic Daylight Time (America/Halifax)</option>
-				<option value="America/Santiago"     >(GMT-03:00) Chile Summer Time (America/Santiago)</option>
-				<option value="America/Sao_Paulo"    >(GMT-03:00) Brasilia Time (America/Sao_Paulo)</option>
-				<option value="Atlantic/Bermuda"     >(GMT-03:00) Atlantic Daylight Time (Atlantic/Bermuda)</option>
-				<option value="America/Indiana/Indianapolis" >(GMT-04:00) Eastern Daylight Time (America/Indiana/Indianapolis)</option>
-				<option value="America/New_York"     >(GMT-04:00) Eastern Daylight Time (America/New_York)</option>
-				<option value="America/Puerto_Rico"  >(GMT-04:00) Atlantic Standard Time (America/Puerto_Rico)</option>
-				<option value="America/Caracas"      >(GMT-04:30) Venezuela Time (America/Caracas)</option>
-				<option value="America/Bogota"       >(GMT-05:00) Colombia Time (America/Bogota)</option>
-				<option value="America/Chicago"      >(GMT-05:00) Central Daylight Time (America/Chicago)</option>
-				<option value="America/Lima"         >(GMT-05:00) Peru Time (America/Lima)</option>
-				<option value="America/Mexico_City"  >(GMT-05:00) Central Daylight Time (America/Mexico_City)</option>
-				<option value="America/Panama"       >(GMT-05:00) Eastern Standard Time (America/Panama)</option>
-				<option value="America/Denver"       >(GMT-06:00) Mountain Daylight Time (America/Denver)</option>
-				<option value="America/El_Salvador"  >(GMT-06:00) Central Standard Time (America/El_Salvador)</option>
-				<option value="America/Mazatlan"     >(GMT-06:00) Mountain Daylight Time (America/Mazatlan)</option>
-				<option value="America/Los_Angeles"  >(GMT-07:00) Pacific Daylight Time (America/Los_Angeles)</option>
-				<option value="America/Phoenix"      >(GMT-07:00) Mountain Standard Time (America/Phoenix)</option>
-				<option value="America/Tijuana"      >(GMT-07:00) Pacific Daylight Time (America/Tijuana)</option>
-				<option value="America/Anchorage"    >(GMT-08:00) Alaska Daylight Time (America/Anchorage)</option>
-				<option value="Pacific/Pitcairn"     >(GMT-08:00) Pitcairn Time (Pacific/Pitcairn)</option>
-				<option value="America/Adak"         >(GMT-09:00) Hawaii-Aleutian Standard Time (America/Adak)</option>
-				<option value="Pacific/Gambier"      >(GMT-09:00) Gambier Time (Pacific/Gambier)</option>
-				<option value="Pacific/Marquesas"    >(GMT-09:30) Marquesas Time (Pacific/Marquesas)</option>
-				<option value="Pacific/Honolulu"     >(GMT-10:00) Hawaii-Aleutian Standard Time (Pacific/Honolulu)</option>
-				<option value="Pacific/Niue"         >(GMT-11:00) Niue Time (Pacific/Niue)</option>
-				<option value="Pacific/Pago_Pago"    >(GMT-11:00) Samoa Standard Time (Pacific/Pago_Pago)</option>
-			</select>
-		</td>
-		<th><s:Locale code="userinfo.locale" />:</th>
-		<td>
-			<select name="locale" id="locale">
-				<option value="" selected="selected">Language</option>
-				<option value="en_US"  >English</option>
-				<option value="nl_NL"  >Dutch</option>
-				<option value="fr"     >French</option>
-				<option value="de"     >German</option>
-				<option value="it"     >Italian</option>
-				<option value="es"     >Spanish</option>
-				<option value="sv"     >Swedish</option>
-				<option value="pt_BR"  >Portuguese  (Brazilian)</option>
-				<option value="ja"     >Japanese</option>
-				<option value="zh_CN" selected >Chinese (Simplified)</option>
-				<option value="zh_TW"  >Chinese (Traditional)</option>
-				<option value="ko"     >Korean</option>
-				<option value="th"     >Thai</option>
-				<option value="fi"     >Finnish</option>
-				<option value="ru"     >Russian</option>
-			</select>
-		</td>
-	</tr>
-	</tbody>
- </table>

+ 0 - 404
maxkey-web-manage/src/main/resources/templates/views/userinfo/userAddCompany.jsp

@@ -1,404 +0,0 @@
-<%@ page   language="java"    import="java.util.*"   pageEncoding="UTF-8"%>
-<%@ taglib prefix="s"  uri="http://www.connsec.com/tags" %>
-<%@ taglib prefix="spring"	  uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="fmt"		  uri="http://java.sun.com/jsp/jstl/fmt"%>
-<%@ taglib prefix="c"		  uri="http://java.sun.com/jsp/jstl/core" %>
-
-<table  class="datatable"  style="display:none" id="table_switch_company" width="980">
-	<tbody>				
-		<tr>
-			<th style="width:15%;"><s:Locale code="userinfo.employeeNumber" />:</th>
-			<td style="width:35%;">
-				<input type="text" id="employeeNumber" name="employeeNumber"  title="" value=""/>
-				<label for="employeeNumber"></label>
-			</td>
-			<th style="width:15%;"><s:Locale code="userinfo.windowsAccount" />:</th>
-			<td style="width:35%;">
-				<input type="text" id="windowsAccount" name="windowsAccount"  title="" value=""/>
-				<label for="windowsAccount"></label>
-			</td>
-		</tr>
-		<tr>
-			<td colspan="4">&nbsp;
-			</td>
-			
-		</tr>
-		
-		<tr>
-			<th><s:Locale code="userinfo.organization" />:</th>
-			<td>
-				<input type="text" id="organization" name="organization"  title="" value=""/>
-				<label for="organization"></label>
-			</td>
-			<th><s:Locale code="userinfo.division" />:</th>
-			<td>
-				<input type="text" id="division" name="division"  title="" value=""/>
-				<label for="division"></label>
-			</td>
-			
-		</tr>
-		
-		<tr>
-			<th><s:Locale code="userinfo.department" />:</th>
-			<td>
-				<input type="hidden" id="departmentId" name="departmentId"  title="" value="${model.departmentId}"/>
-				<input type="text" style="width:70%"  id="department" name="department"  title="" value="${model.department}"/>
-				<s:Dialog text="button.text.select" title="department" url="/orgs/orgsSelect/deptId/department" width="300" height="400" />
-				<label for="department"></label>
-			</td>
-			<th><s:Locale code="userinfo.costCenter" />:</th>
-			<td>
-				<input type="text" id="costCenter" name="costCenter"  title="" value=""/>
-				<label for="costCenter"></label>
-			</td>
-			
-		</tr>
-		<tr>
-			<th><s:Locale code="userinfo.jobTitle" />:</th>
-			<td>
-				<input type="text" id="jobTitle" name="jobTitle"  title="" value=""/>
-				<label for="jobTitle"></label>
-			</td>
-			<th><s:Locale code="userinfo.jobLevel" />:</th>
-			<td>
-				<input type="text" id="jobLevel" name="jobLevel"  title="" value=""/>
-				<label for="jobLevel"></label>
-			</td>
-		</tr>
-		<tr>
-			<th><s:Locale code="userinfo.manager" />:</th>
-			<td>
-				<input type="hidden" id="managerId" name="managerId"  title="" value=""/>
-				<input type="text" id="manager" name="manager"  title="" value=""/>
-				<label for="manager"></label>
-			</td>
-			<th><s:Locale code="userinfo.assistant" />:</th>
-			<td>
-				<input type="hidden" id="assistantId" name="assistantId"  title="" value=""/>
-				<input  type="text" id="assistant" name="assistant"  title="" value=""/>
-				<label for="delegatedApprover"></label>
-			</td>
-		</tr>
-		<tr>
-			<th><s:Locale code="userinfo.entryDate" />:</th>
-			<td>
-				<input type="text" id="entryDate" name="entryDate"  title="" value=""/>
-				<label for="entryDate"></label>
-			</td>
-			<th><s:Locale code="userinfo.quitDate" />:</th>
-			<td>
-				<input  type="text" id="quitDate" name="quitDate"  title="" value=""/>
-				<label for="delegatedApprover"></label>
-			</td>
-		</tr>
-		<tr>
-			<td colspan="4">&nbsp;
-			</td>
-			
-		</tr>
-		<tr>
-			<th><s:Locale code="userinfo.workCountry" />:</th>
-			<td nowrap >
-				<select  id="workCountry" name="workCountry">
-					<option value="AFG" >Afghanistan</option>
-					<option value="ALA" >Åland Islands</option>
-					<option value="ALB" >Albania</option>
-					<option value="DZA" >Algeria</option>
-					<option value="ASM" >American Samoa</option>
-					<option value="AND" >Andorra</option>
-					<option value="AGO" >Angola</option>
-					<option value="AIA" >Anguilla</option>
-					<option value="ATA" >Antarctica</option>
-					<option value="ATG" >Antigua and Barbuda</option>
-					<option value="ARG" >Argentina</option>
-					<option value="ARM" >Armenia</option>
-					<option value="ABW" >Aruba</option>
-					<option value="AUS" >Australia</option>
-					<option value="AUT" >Austria</option>
-					<option value="AZE" >Azerbaijan</option>
-					<option value="BHS" >Bahamas</option>
-					<option value="BHR" >Bahrain</option>
-					<option value="BGD" >Bangladesh</option>
-					<option value="BRB" >Barbados</option>
-					<option value="BLR" >Belarus</option>
-					<option value="BEL" >Belgium</option>
-					<option value="BLZ" >Belize</option>
-					<option value="BEN" >Benin</option>
-					<option value="BMU" >Bermuda</option>
-					<option value="BTN" >Bhutan</option>
-					<option value="BOL" >Bolivia, Plurinational State of</option>
-					<option value="BES" >Bonaire, Sint Eustatius and Saba</option>
-					<option value="BIH" >Bosnia and Herzegovina</option>
-					<option value="BWA" >Botswana</option>
-					<option value="BVT" >Bouvet Island</option>
-					<option value="BRA" >Brazil</option>
-					<option value="IOT" >British Indian Ocean Territory</option>
-					<option value="BRN" >Brunei Darussalam</option>
-					<option value="BGR" >Bulgaria</option>
-					<option value="BFA" >Burkina Faso</option>
-					<option value="BDI" >Burundi</option>
-					<option value="KHM" >Cambodia</option>
-					<option value="CMR" >Cameroon</option>
-					<option value="CAN" >Canada</option>
-					<option value="CPV" >Cape Verde</option>
-					<option value="CYM" >Cayman Islands</option>
-					<option value="CAF" >Central African Republic</option>
-					<option value="TCD" >Chad</option>
-					<option value="CHL" >Chile</option>
-					<option value="CHN" selected >China</option>
-					<option value="CXR" >Christmas Island</option>
-					<option value="CCK" >Cocos (Keeling) Islands</option>
-					<option value="COL" >Colombia</option>
-					<option value="COM" >Comoros</option>
-					<option value="COG" >Congo</option>
-					<option value="COD" >Congo, the Democratic Republic of the</option>
-					<option value="COK" >Cook Islands</option>
-					<option value="CRI" >Costa Rica</option>
-					<option value="CIV" >Côte d'Ivoire</option>
-					<option value="HRV" >Croatia</option>
-					<option value="CUB" >Cuba</option>
-					<option value="CUW" >Curaçao</option>
-					<option value="CYP" >Cyprus</option>
-					<option value="CZE" >Czech Republic</option>
-					<option value="DNK" >Denmark</option>
-					<option value="DJI" >Djibouti</option>
-					<option value="DMA" >Dominica</option>
-					<option value="DOM" >Dominican Republic</option>
-					<option value="ECU" >Ecuador</option>
-					<option value="EGY" >Egypt</option>
-					<option value="SLV" >El Salvador</option>
-					<option value="GNQ" >Equatorial Guinea</option>
-					<option value="ERI" >Eritrea</option>
-					<option value="EST" >Estonia</option>
-					<option value="ETH" >Ethiopia</option>
-					<option value="FLK" >Falkland Islands (Malvinas)</option>
-					<option value="FRO" >Faroe Islands</option>
-					<option value="FJI" >Fiji</option>
-					<option value="FIN" >Finland</option>
-					<option value="FRA" >France</option>
-					<option value="GUF" >French Guiana</option>
-					<option value="PYF" >French Polynesia</option>
-					<option value="ATF" >French Southern Territories</option>
-					<option value="GAB" >Gabon</option>
-					<option value="GMB" >Gambia</option>
-					<option value="GEO" >Georgia</option>
-					<option value="DEU" >Germany</option>
-					<option value="GHA" >Ghana</option>
-					<option value="GIB" >Gibraltar</option>
-					<option value="GRC" >Greece</option>
-					<option value="GRL" >Greenland</option>
-					<option value="GRD" >Grenada</option>
-					<option value="GLP" >Guadeloupe</option>
-					<option value="GUM" >Guam</option>
-					<option value="GTM" >Guatemala</option>
-					<option value="GGY" >Guernsey</option>
-					<option value="GIN" >Guinea</option>
-					<option value="GNB" >Guinea-Bissau</option>
-					<option value="GUY" >Guyana</option>
-					<option value="HTI" >Haiti</option>
-					<option value="HMD" >Heard Island and McDonald Islands</option>
-					<option value="VAT" >Holy See (Vatican City State)</option>
-					<option value="HND" >Honduras</option>
-					<option value="HKG" >Hong Kong</option>
-					<option value="HUN" >Hungary</option>
-					<option value="ISL" >Iceland</option>
-					<option value="IND" >India</option>
-					<option value="IDN" >Indonesia</option>
-					<option value="IRN" >Iran, Islamic Republic of</option>
-					<option value="IRQ" >Iraq</option>
-					<option value="IRL" >Ireland</option>
-					<option value="IMN" >Isle of Man</option>
-					<option value="ISR" >Israel</option>
-					<option value="ITA" >Italy</option>
-					<option value="JAM" >Jamaica</option>
-					<option value="JPN" >Japan</option>
-					<option value="JEY" >Jersey</option>
-					<option value="JOR" >Jordan</option>
-					<option value="KAZ" >Kazakhstan</option>
-					<option value="KEN" >Kenya</option>
-					<option value="KIR" >Kiribati</option>
-					<option value="PRK" >Korea, Democratic People's Republic of</option>
-					<option value="KOR" >Korea, Republic of</option>
-					<option value="KWT" >Kuwait</option>
-					<option value="KGZ" >Kyrgyzstan</option>
-					<option value="LAO" >Lao People's Democratic Republic</option>
-					<option value="LVA" >Latvia</option>
-					<option value="LBN" >Lebanon</option>
-					<option value="LSO" >Lesotho</option>
-					<option value="LBR" >Liberia</option>
-					<option value="LBY" >Libya</option>
-					<option value="LIE" >Liechtenstein</option>
-					<option value="LTU" >Lithuania</option>
-					<option value="LUX" >Luxembourg</option>
-					<option value="MAC" >Macao</option>
-					<option value="MKD" >Macedonia, the former Yugoslav Republic of</option>
-					<option value="MDG" >Madagascar</option>
-					<option value="MWI" >Malawi</option>
-					<option value="MYS" >Malaysia</option>
-					<option value="MDV" >Maldives</option>
-					<option value="MLI" >Mali</option>
-					<option value="MLT" >Malta</option>
-					<option value="MHL" >Marshall Islands</option>
-					<option value="MTQ" >Martinique</option>
-					<option value="MRT" >Mauritania</option>
-					<option value="MUS" >Mauritius</option>
-					<option value="MYT" >Mayotte</option>
-					<option value="MEX" >Mexico</option>
-					<option value="FSM" >Micronesia, Federated States of</option>
-					<option value="MDA" >Moldova, Republic of</option>
-					<option value="MCO" >Monaco</option>
-					<option value="MNG" >Mongolia</option>
-					<option value="MNE" >Montenegro</option>
-					<option value="MSR" >Montserrat</option>
-					<option value="MAR" >Morocco</option>
-					<option value="MOZ" >Mozambique</option>
-					<option value="MMR" >Myanmar</option>
-					<option value="NAM" >Namibia</option>
-					<option value="NRU" >Nauru</option>
-					<option value="NPL" >Nepal</option>
-					<option value="NLD" >Netherlands</option>
-					<option value="NCL" >New Caledonia</option>
-					<option value="NZL" >New Zealand</option>
-					<option value="NIC" >Nicaragua</option>
-					<option value="NER" >Niger</option>
-					<option value="NGA" >Nigeria</option>
-					<option value="NIU" >Niue</option>
-					<option value="NFK" >Norfolk Island</option>
-					<option value="MNP" >Northern Mariana Islands</option>
-					<option value="NOR" >Norway</option>
-					<option value="OMN" >Oman</option>
-					<option value="PAK" >Pakistan</option>
-					<option value="PLW" >Palau</option>
-					<option value="PSE" >Palestinian Territory, Occupied</option>
-					<option value="PAN" >Panama</option>
-					<option value="PNG" >Papua New Guinea</option>
-					<option value="PRY" >Paraguay</option>
-					<option value="PER" >Peru</option>
-					<option value="PHL" >Philippines</option>
-					<option value="PCN" >Pitcairn</option>
-					<option value="POL" >Poland</option>
-					<option value="PRT" >Portugal</option>
-					<option value="PRI" >Puerto Rico</option>
-					<option value="QAT" >Qatar</option>
-					<option value="REU" >Réunion</option>
-					<option value="ROU" >Romania</option>
-					<option value="RUS" >Russian Federation</option>
-					<option value="RWA" >Rwanda</option>
-					<option value="BLM" >Saint Barthélemy</option>
-					<option value="SHN" >Saint Helena, Ascension and Tristan da Cunha</option>
-					<option value="KNA" >Saint Kitts and Nevis</option>
-					<option value="LCA" >Saint Lucia</option>
-					<option value="MAF" >Saint Martin (French part)</option>
-					<option value="SPM" >Saint Pierre and Miquelon</option>
-					<option value="VCT" >Saint Vincent and the Grenadines</option>
-					<option value="WSM" >Samoa</option>
-					<option value="SMR" >San Marino</option>
-					<option value="STP" >Sao Tome and Principe</option>
-					<option value="SAU" >Saudi Arabia</option>
-					<option value="SEN" >Senegal</option>
-					<option value="SRB" >Serbia</option>
-					<option value="SYC" >Seychelles</option>
-					<option value="SLE" >Sierra Leone</option>
-					<option value="SGP" >Singapore</option>
-					<option value="SXM" >Sint Maarten (Dutch part)</option>
-					<option value="SVK" >Slovakia</option>
-					<option value="SVN" >Slovenia</option>
-					<option value="SLB" >Solomon Islands</option>
-					<option value="SOM" >Somalia</option>
-					<option value="ZAF" >South Africa</option>
-					<option value="SGS" >South Georgia and the South Sandwich Islands</option>
-					<option value="SSD" >South Sudan</option>
-					<option value="ESP" >Spain</option>
-					<option value="LKA" >Sri Lanka</option>
-					<option value="SDN" >Sudan</option>
-					<option value="SUR" >Suriname</option>
-					<option value="SJM" >Svalbard and Jan Mayen</option>
-					<option value="SWZ" >Swaziland</option>
-					<option value="SWE" >Sweden</option>
-					<option value="CHE" >Switzerland</option>
-					<option value="SYR" >Syrian Arab Republic</option>
-					<option value="TWN" >Taiwan, Province of China</option>
-					<option value="TJK" >Tajikistan</option>
-					<option value="TZA" >Tanzania, United Republic of</option>
-					<option value="THA" >Thailand</option>
-					<option value="TLS" >Timor-Leste</option>
-					<option value="TGO" >Togo</option>
-					<option value="TKL" >Tokelau</option>
-					<option value="TON" >Tonga</option>
-					<option value="TTO" >Trinidad and Tobago</option>
-					<option value="TUN" >Tunisia</option>
-					<option value="TUR" >Turkey</option>
-					<option value="TKM" >Turkmenistan</option>
-					<option value="TCA" >Turks and Caicos Islands</option>
-					<option value="TUV" >Tuvalu</option>
-					<option value="UGA" >Uganda</option>
-					<option value="UKR" >Ukraine</option>
-					<option value="ARE" >United Arab Emirates</option>
-					<option value="GBR" >United Kingdom</option>
-					<option value="USA" >United States</option>
-					<option value="UMI" >United States Minor Outlying Islands</option>
-					<option value="URY" >Uruguay</option>
-					<option value="UZB" >Uzbekistan</option>
-					<option value="VUT" >Vanuatu</option>
-					<option value="VEN" >Venezuela, Bolivarian Republic of</option>
-					<option value="VNM" >Viet Nam</option>
-					<option value="VGB" >Virgin Islands, British</option>
-					<option value="VIR" >Virgin Islands, U.S.</option>
-					<option value="WLF" >Wallis and Futuna</option>
-					<option value="ESH" >Western Sahara</option>
-					<option value="YEM" >Yemen</option>
-					<option value="ZMB" >Zambia</option>
-					<option value="ZWE" >Zimbabwe</option>
-				</select>
-			</td>
-			<th><s:Locale code="userinfo.workRegion" />:</th>
-			<td>
-				<input type="text" id="workRegion" name="workRegion"  title="" value=""/>
-				<label for="province"></label>
-			</td>
-		</tr>
-		<tr>
-			<th><s:Locale code="userinfo.workLocality" />:</th>
-			<td>
-				<input type="text" id="workLocality" name="workLocality"  title="" value=""/>
-				<label for="workLocality"></label>
-			</td>
-			<th><s:Locale code="userinfo.workStreetAddress" />:</th>
-			<td>
-				<input type="text" id="workStreetAddress" name="workStreetAddress"  title="" value=""/>
-				<label for="street"></label>
-			</td>
-		</tr>
-		<tr>
-			
-			<th><s:Locale code="userinfo.workPostalCode" />:</th>
-			<td>
-				<input type="text" id="workPostalCode" name="workPostalCode"  title="" value=""/>
-				<label for="workPostalCode"></label>
-			</td>
-			<th><s:Locale code="userinfo.workFax" />:</th>
-			<td>
-				<input type="text" id="workFax" name="workFax"  title="" value=""/>
-				<label for="workFax"></label>
-			</td>
-		</tr>
-
-		<tr>
-			<th><s:Locale code="userinfo.workPhoneNumber" />:</th>
-			<td>
-				<input type="text" id="workPhoneNumber" name="workPhoneNumber"  title="" value=""/>
-				<label for="workPhoneNumber"></label>
-			</td>
-			<th><s:Locale code="userinfo.workEmail" />:</th>
-			<td>
-				<input type="text" id="workEmail" name="workEmail"  title="" value=""/>
-				<label for="workEmail"></label>
-			</td>
-		</tr>
-		<tr>
-			<td colspan="4">&nbsp;
-			</td>
-			
-		</tr>					
-	</tbody>
-</table>

+ 0 - 428
maxkey-web-manage/src/main/resources/templates/views/userinfo/userAddHome.jsp

@@ -1,428 +0,0 @@
-<%@ page   language="java"    import="java.util.*"   pageEncoding="UTF-8"%>
-<%@ taglib prefix="s"  uri="http://www.connsec.com/tags" %>
-<%@ taglib prefix="spring"	  uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="fmt"		  uri="http://java.sun.com/jsp/jstl/fmt"%>
-<%@ taglib prefix="c"		  uri="http://java.sun.com/jsp/jstl/core" %>
-<table  class="datatable"  style="display:none" id="table_switch_home" width="980">
-	<tbody>				
-		<tr>
-			<th style="width:15%;"><s:Locale code="userinfo.idType" />:</th>
-			<td style="width:35%;">
-				<select name="idType"  class="select_t">
-					<option value="0" selected ><s:Locale code="userinfo.usertype.UNKNOWN" /></option>
-					<option value="1"  ><s:Locale code="userinfo.usertype.IDCARD" /></option>
-					<option value="2"  ><s:Locale code="userinfo.usertype.PASSPORT" /></option>
-					<option value="3"  ><s:Locale code="userinfo.usertype.STUDENTCARD" /></option>
-					<option value="4"  ><s:Locale code="userinfo.usertype.MILITARYCARD" /></option>
-				</select>
-			</td>
-			
-			<th style="width:15%;"><s:Locale code="userinfo.idCardNo" />:</th>
-			<td style="width:35%;">
-				<input type="text" id="idCardNo" name="idCardNo"  title="" value=""/>
-				<label for="idCardNo"></label>
-			</td>
-		</tr>
-		<tr>
-			
-			<th><s:Locale code="userinfo.married" />:</th>
-			<td>
-				<select name="married"  class="select_t">
-					<option value="0" selected><s:Locale code="userinfo.usertype.UNKNOWN" /></option>
-					<option value="1" ><s:Locale code="userinfo.usertype.SINGLE" /></option>
-					<option value="2" ><s:Locale code="userinfo.usertype.MARRIED" /></option>
-					<option value="3" ><s:Locale code="userinfo.usertype.DIVORCE" /></option>
-					<option value="4" ><s:Locale code="userinfo.usertype.WIDOWED" /></option>
-				</select>
-			</td>
-			<th><s:Locale code="userinfo.startWorkDate" />:</th>
-			<td>
-				<input type="text" id="startWorkDate" name="startWorkDate"  title="" value=""/>
-				<label for="startWorkDate"></label>
-			</td>
-		</tr>
-		<tr>
-			<td colspan="4">&nbsp;
-			</td>
-			
-		</tr>
-		
-		<tr>
-			<th><s:Locale code="userinfo.homeCountry" />:</th>
-			<td>
-				<select  id="homeCountry" name="homeCountry">
-					<option value="AFG" >Afghanistan</option>
-					<option value="ALA" >Åland Islands</option>
-					<option value="ALB" >Albania</option>
-					<option value="DZA" >Algeria</option>
-					<option value="ASM" >American Samoa</option>
-					<option value="AND" >Andorra</option>
-					<option value="AGO" >Angola</option>
-					<option value="AIA" >Anguilla</option>
-					<option value="ATA" >Antarctica</option>
-					<option value="ATG" >Antigua and Barbuda</option>
-					<option value="ARG" >Argentina</option>
-					<option value="ARM" >Armenia</option>
-					<option value="ABW" >Aruba</option>
-					<option value="AUS" >Australia</option>
-					<option value="AUT" >Austria</option>
-					<option value="AZE" >Azerbaijan</option>
-					<option value="BHS" >Bahamas</option>
-					<option value="BHR" >Bahrain</option>
-					<option value="BGD" >Bangladesh</option>
-					<option value="BRB" >Barbados</option>
-					<option value="BLR" >Belarus</option>
-					<option value="BEL" >Belgium</option>
-					<option value="BLZ" >Belize</option>
-					<option value="BEN" >Benin</option>
-					<option value="BMU" >Bermuda</option>
-					<option value="BTN" >Bhutan</option>
-					<option value="BOL" >Bolivia, Plurinational State of</option>
-					<option value="BES" >Bonaire, Sint Eustatius and Saba</option>
-					<option value="BIH" >Bosnia and Herzegovina</option>
-					<option value="BWA" >Botswana</option>
-					<option value="BVT" >Bouvet Island</option>
-					<option value="BRA" >Brazil</option>
-					<option value="IOT" >British Indian Ocean Territory</option>
-					<option value="BRN" >Brunei Darussalam</option>
-					<option value="BGR" >Bulgaria</option>
-					<option value="BFA" >Burkina Faso</option>
-					<option value="BDI" >Burundi</option>
-					<option value="KHM" >Cambodia</option>
-					<option value="CMR" >Cameroon</option>
-					<option value="CAN" >Canada</option>
-					<option value="CPV" >Cape Verde</option>
-					<option value="CYM" >Cayman Islands</option>
-					<option value="CAF" >Central African Republic</option>
-					<option value="TCD" >Chad</option>
-					<option value="CHL" >Chile</option>
-					<option value="CHN" selected >China</option>
-					<option value="CXR" >Christmas Island</option>
-					<option value="CCK" >Cocos (Keeling) Islands</option>
-					<option value="COL" >Colombia</option>
-					<option value="COM" >Comoros</option>
-					<option value="COG" >Congo</option>
-					<option value="COD" >Congo, the Democratic Republic of the</option>
-					<option value="COK" >Cook Islands</option>
-					<option value="CRI" >Costa Rica</option>
-					<option value="CIV" >Côte d'Ivoire</option>
-					<option value="HRV" >Croatia</option>
-					<option value="CUB" >Cuba</option>
-					<option value="CUW" >Curaçao</option>
-					<option value="CYP" >Cyprus</option>
-					<option value="CZE" >Czech Republic</option>
-					<option value="DNK" >Denmark</option>
-					<option value="DJI" >Djibouti</option>
-					<option value="DMA" >Dominica</option>
-					<option value="DOM" >Dominican Republic</option>
-					<option value="ECU" >Ecuador</option>
-					<option value="EGY" >Egypt</option>
-					<option value="SLV" >El Salvador</option>
-					<option value="GNQ" >Equatorial Guinea</option>
-					<option value="ERI" >Eritrea</option>
-					<option value="EST" >Estonia</option>
-					<option value="ETH" >Ethiopia</option>
-					<option value="FLK" >Falkland Islands (Malvinas)</option>
-					<option value="FRO" >Faroe Islands</option>
-					<option value="FJI" >Fiji</option>
-					<option value="FIN" >Finland</option>
-					<option value="FRA" >France</option>
-					<option value="GUF" >French Guiana</option>
-					<option value="PYF" >French Polynesia</option>
-					<option value="ATF" >French Southern Territories</option>
-					<option value="GAB" >Gabon</option>
-					<option value="GMB" >Gambia</option>
-					<option value="GEO" >Georgia</option>
-					<option value="DEU" >Germany</option>
-					<option value="GHA" >Ghana</option>
-					<option value="GIB" >Gibraltar</option>
-					<option value="GRC" >Greece</option>
-					<option value="GRL" >Greenland</option>
-					<option value="GRD" >Grenada</option>
-					<option value="GLP" >Guadeloupe</option>
-					<option value="GUM" >Guam</option>
-					<option value="GTM" >Guatemala</option>
-					<option value="GGY" >Guernsey</option>
-					<option value="GIN" >Guinea</option>
-					<option value="GNB" >Guinea-Bissau</option>
-					<option value="GUY" >Guyana</option>
-					<option value="HTI" >Haiti</option>
-					<option value="HMD" >Heard Island and McDonald Islands</option>
-					<option value="VAT" >Holy See (Vatican City State)</option>
-					<option value="HND" >Honduras</option>
-					<option value="HKG" >Hong Kong</option>
-					<option value="HUN" >Hungary</option>
-					<option value="ISL" >Iceland</option>
-					<option value="IND" >India</option>
-					<option value="IDN" >Indonesia</option>
-					<option value="IRN" >Iran, Islamic Republic of</option>
-					<option value="IRQ" >Iraq</option>
-					<option value="IRL" >Ireland</option>
-					<option value="IMN" >Isle of Man</option>
-					<option value="ISR" >Israel</option>
-					<option value="ITA" >Italy</option>
-					<option value="JAM" >Jamaica</option>
-					<option value="JPN" >Japan</option>
-					<option value="JEY" >Jersey</option>
-					<option value="JOR" >Jordan</option>
-					<option value="KAZ" >Kazakhstan</option>
-					<option value="KEN" >Kenya</option>
-					<option value="KIR" >Kiribati</option>
-					<option value="PRK" >Korea, Democratic People's Republic of</option>
-					<option value="KOR" >Korea, Republic of</option>
-					<option value="KWT" >Kuwait</option>
-					<option value="KGZ" >Kyrgyzstan</option>
-					<option value="LAO" >Lao People's Democratic Republic</option>
-					<option value="LVA" >Latvia</option>
-					<option value="LBN" >Lebanon</option>
-					<option value="LSO" >Lesotho</option>
-					<option value="LBR" >Liberia</option>
-					<option value="LBY" >Libya</option>
-					<option value="LIE" >Liechtenstein</option>
-					<option value="LTU" >Lithuania</option>
-					<option value="LUX" >Luxembourg</option>
-					<option value="MAC" >Macao</option>
-					<option value="MKD" >Macedonia, the former Yugoslav Republic of</option>
-					<option value="MDG" >Madagascar</option>
-					<option value="MWI" >Malawi</option>
-					<option value="MYS" >Malaysia</option>
-					<option value="MDV" >Maldives</option>
-					<option value="MLI" >Mali</option>
-					<option value="MLT" >Malta</option>
-					<option value="MHL" >Marshall Islands</option>
-					<option value="MTQ" >Martinique</option>
-					<option value="MRT" >Mauritania</option>
-					<option value="MUS" >Mauritius</option>
-					<option value="MYT" >Mayotte</option>
-					<option value="MEX" >Mexico</option>
-					<option value="FSM" >Micronesia, Federated States of</option>
-					<option value="MDA" >Moldova, Republic of</option>
-					<option value="MCO" >Monaco</option>
-					<option value="MNG" >Mongolia</option>
-					<option value="MNE" >Montenegro</option>
-					<option value="MSR" >Montserrat</option>
-					<option value="MAR" >Morocco</option>
-					<option value="MOZ" >Mozambique</option>
-					<option value="MMR" >Myanmar</option>
-					<option value="NAM" >Namibia</option>
-					<option value="NRU" >Nauru</option>
-					<option value="NPL" >Nepal</option>
-					<option value="NLD" >Netherlands</option>
-					<option value="NCL" >New Caledonia</option>
-					<option value="NZL" >New Zealand</option>
-					<option value="NIC" >Nicaragua</option>
-					<option value="NER" >Niger</option>
-					<option value="NGA" >Nigeria</option>
-					<option value="NIU" >Niue</option>
-					<option value="NFK" >Norfolk Island</option>
-					<option value="MNP" >Northern Mariana Islands</option>
-					<option value="NOR" >Norway</option>
-					<option value="OMN" >Oman</option>
-					<option value="PAK" >Pakistan</option>
-					<option value="PLW" >Palau</option>
-					<option value="PSE" >Palestinian Territory, Occupied</option>
-					<option value="PAN" >Panama</option>
-					<option value="PNG" >Papua New Guinea</option>
-					<option value="PRY" >Paraguay</option>
-					<option value="PER" >Peru</option>
-					<option value="PHL" >Philippines</option>
-					<option value="PCN" >Pitcairn</option>
-					<option value="POL" >Poland</option>
-					<option value="PRT" >Portugal</option>
-					<option value="PRI" >Puerto Rico</option>
-					<option value="QAT" >Qatar</option>
-					<option value="REU" >Réunion</option>
-					<option value="ROU" >Romania</option>
-					<option value="RUS" >Russian Federation</option>
-					<option value="RWA" >Rwanda</option>
-					<option value="BLM" >Saint Barthélemy</option>
-					<option value="SHN" >Saint Helena, Ascension and Tristan da Cunha</option>
-					<option value="KNA" >Saint Kitts and Nevis</option>
-					<option value="LCA" >Saint Lucia</option>
-					<option value="MAF" >Saint Martin (French part)</option>
-					<option value="SPM" >Saint Pierre and Miquelon</option>
-					<option value="VCT" >Saint Vincent and the Grenadines</option>
-					<option value="WSM" >Samoa</option>
-					<option value="SMR" >San Marino</option>
-					<option value="STP" >Sao Tome and Principe</option>
-					<option value="SAU" >Saudi Arabia</option>
-					<option value="SEN" >Senegal</option>
-					<option value="SRB" >Serbia</option>
-					<option value="SYC" >Seychelles</option>
-					<option value="SLE" >Sierra Leone</option>
-					<option value="SGP" >Singapore</option>
-					<option value="SXM" >Sint Maarten (Dutch part)</option>
-					<option value="SVK" >Slovakia</option>
-					<option value="SVN" >Slovenia</option>
-					<option value="SLB" >Solomon Islands</option>
-					<option value="SOM" >Somalia</option>
-					<option value="ZAF" >South Africa</option>
-					<option value="SGS" >South Georgia and the South Sandwich Islands</option>
-					<option value="SSD" >South Sudan</option>
-					<option value="ESP" >Spain</option>
-					<option value="LKA" >Sri Lanka</option>
-					<option value="SDN" >Sudan</option>
-					<option value="SUR" >Suriname</option>
-					<option value="SJM" >Svalbard and Jan Mayen</option>
-					<option value="SWZ" >Swaziland</option>
-					<option value="SWE" >Sweden</option>
-					<option value="CHE" >Switzerland</option>
-					<option value="SYR" >Syrian Arab Republic</option>
-					<option value="TWN" >Taiwan, Province of China</option>
-					<option value="TJK" >Tajikistan</option>
-					<option value="TZA" >Tanzania, United Republic of</option>
-					<option value="THA" >Thailand</option>
-					<option value="TLS" >Timor-Leste</option>
-					<option value="TGO" >Togo</option>
-					<option value="TKL" >Tokelau</option>
-					<option value="TON" >Tonga</option>
-					<option value="TTO" >Trinidad and Tobago</option>
-					<option value="TUN" >Tunisia</option>
-					<option value="TUR" >Turkey</option>
-					<option value="TKM" >Turkmenistan</option>
-					<option value="TCA" >Turks and Caicos Islands</option>
-					<option value="TUV" >Tuvalu</option>
-					<option value="UGA" >Uganda</option>
-					<option value="UKR" >Ukraine</option>
-					<option value="ARE" >United Arab Emirates</option>
-					<option value="GBR" >United Kingdom</option>
-					<option value="USA" >United States</option>
-					<option value="UMI" >United States Minor Outlying Islands</option>
-					<option value="URY" >Uruguay</option>
-					<option value="UZB" >Uzbekistan</option>
-					<option value="VUT" >Vanuatu</option>
-					<option value="VEN" >Venezuela, Bolivarian Republic of</option>
-					<option value="VNM" >Viet Nam</option>
-					<option value="VGB" >Virgin Islands, British</option>
-					<option value="VIR" >Virgin Islands, U.S.</option>
-					<option value="WLF" >Wallis and Futuna</option>
-					<option value="ESH" >Western Sahara</option>
-					<option value="YEM" >Yemen</option>
-					<option value="ZMB" >Zambia</option>
-					<option value="ZWE" >Zimbabwe</option>
-				</select>
-			</td>
-			<th><s:Locale code="userinfo.homeRegion" />:</th>
-			<td>
-				<input type="text" id="homeRegion" name="homeRegion"  title="" value=""/>
-				<label for="homeRegion"></label>
-			</td>
-		</tr>
-		<tr>
-			
-			<th><s:Locale code="userinfo.homeLocality" />:</th>
-			<td>
-				<input type="text" id="homeLocality" name="homeLocality"  title="" value=""/>
-				<label for="homeLocality"></label>
-			</td>
-			<th><s:Locale code="userinfo.homeStreetAddress" />:</th>
-			<td>
-				<input type="text" id="homeStreetAddress" name="homeStreetAddress"  title="" value=""/>
-				<label for="homeStreetAddress"></label>
-			</td>
-		</tr>
-		<tr>
-			
-			<th><s:Locale code="userinfo.homePostalCode" />:</th>
-			<td>
-				<input type="text" id="homePostalCode" name="homePostalCode"  title="" value=""/>
-				<label for="homePostalCode"></label>
-			</td>
-			<th><s:Locale code="userinfo.homeFax" />:</th>
-			<td>
-				<input type="text" id="homeFax" name="homeFax"  title="" value=""/>
-				<label for="homeFax"></label>
-			</td>
-		</tr>
-		
-		<tr>
-			<th><s:Locale code="userinfo.homePhoneNumber" />:</th>
-			<td>
-				<input type="text" id="homePhoneNumber" name="homePhoneNumber"  title="" value=""/>
-				<label for="homePhoneNumber"></label>
-			</td>
-			<th><s:Locale code="userinfo.homeEmail" />:</th>
-			<td >
-				<input type="text" id="homeEmail" name="homeEmail"  title="" value=""/>
-				<label for="homeEmail"></label>
-			</td>
-		</tr>
-		<tr>
-			<td colspan="4">&nbsp;
-			</td>
-			
-		</tr>
-		<tr>
-					<th><s:Locale code="QQ" />:</th>
-					<td>
-						<input type="text" id="qq" name="qq"  title="" value=""/>
-						<label for="qq"></label>
-					</td>
-					<th><s:Locale code="userinfo.ims.weixin" />:</th>
-					<td >
-						<input type="text" id="weixin" name="weixin"  title="" value=""/>
-						<label for="weixin"></label>
-					</td>
-				</tr>
-				<tr>
-					<th><s:Locale code="userinfo.ims.sinaweibo" />:</th>
-					<td>
-						<input type="text" id="sinaweibo" name="sinaweibo"  title="" value=""/>
-						<label for="sinaweibo"></label>
-					</td>
-					<th><s:Locale code="userinfo.ims.yixin" />:</th>
-					<td >
-						<input type="text" id="yixin" name="yixin"  title="" value=""/>
-						<label for="weixin"></label>
-					</td>
-				</tr>
-				<tr>
-					<th><s:Locale code="Facebook" />:</th>
-					<td>
-						<input type="text" id="facebook" name="facebook"  title="" value=""/>
-						<label for="facebook"></label>
-					</td>
-					<th><s:Locale code="Skype" />:</th>
-					<td >
-						<input type="text" id="skype" name="skype"  title="" value=""/>
-						<label for="weixin"></label>
-					</td>
-				</tr>
-				<tr>
-					<th><s:Locale code="MSN" />:</th>
-					<td>
-						<input type="text" id="msn" name="msn"  title="" value=""/>
-						<label for="msn"></label>
-					</td>
-					<th><s:Locale code="GTalk" />:</th>
-					<td >
-						<input type="text" id="gtalk" name="gtalk"  title="" value=""/>
-						<label for="gtalk"></label>
-					</td>
-				</tr>
-				<tr>
-					<th><s:Locale code="YAHOO" />:</th>
-					<td>
-						<input type="text" id="yahoo" name="yahoo"  title="" value=""/>
-						<label for="yahoo"></label>
-					</td>
-					<th><s:Locale code="LINE" />:</th>
-					<td >
-						<input type="text" id="line" name="line"  title="" value=""/>
-						<label for="line"></label>
-					</td>
-				</tr>
-				<tr>
-					<th><s:Locale code="AIM" />:</th>
-					<td>
-						<input type="text" id="aim" name="aim"  title="" value=""/>
-						<label for="aim"></label>
-					</td>
-					<th><s:Locale code="userinfo.ims.define" />:</th>
-					<td >
-						<input type="text" id="defineIm" name="defineIm"  title="" value=""/>
-						<label for="defineIm"></label>
-					</td>
-				</tr>
-	</tbody>
-</table>

+ 501 - 0
maxkey-web-manage/src/main/resources/templates/views/userinfo/userUpdate.ftl

@@ -0,0 +1,501 @@
+<!DOCTYPE HTML>
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+	<#include  "../layout/header.ftl"/>
+	<#include  "../layout/common.cssjs.ftl"/>
+<script type="text/javascript">
+   <!--
+      $(function(){	
+      	$("#picture").on("click",function(){
+      		$("#pictureFile").click();
+      	});
+      });
+      //-->
+</script>
+
+<style   type="text/css">
+  .table th, .table td {
+    padding: .2rem;
+    vertical-align: middle;
+  }
+</style>
+</head>
+<body>
+<form  
+	method="post"
+	type="alert"  
+	action="<@base/>/users/update" 
+	autoclose="true" 
+	enctype="multipart/form-data">
+	 <div class="" style="width:100%;">
+		<div class="top">
+			<ul class="switch_tab"  style="width:100%" >
+				<li id="switch_basic" value="table_switch_basic" style="width:30%" class="switch_tab_class switch_tab_current"><a href="javascript:void(0);"><@locale code="userinfo.tab.basic" /></a></li>
+				<li id="switch_company"  value="table_switch_company" style="width:30%" class="switch_tab_class"><a href="javascript:void(0);"><@locale code="userinfo.tab.business" /></a></li>
+				<li id="switch_home"  value="table_switch_home" style="width:30%" class="switch_tab_class"><a href="javascript:void(0);"><@locale code="userinfo.tab.personal" /></a></li>
+				
+			</ul>
+		</div>
+
+	    <div class="main">
+	    <div class="mainin">			 
+  	        <!-- content -->    
+  	      	<!--table-->
+			 <table id="table_switch_basic" width="980" class="table table-bordered" >
+	<tbody>				
+	<tr>
+		<td style="width:15%;"><@locale code="userinfo.username" />:</td>
+		<td style="width:35%;">
+			<input type="hidden" id="id" name="id" value="${model.id!""}"/>
+			<input  class="form-control"  type="text" id="username" name="username"  title="" value="${model.username!""}"/>
+		</td>
+		<td style="width:15%;"><@locale code="login.text.password" />:</td>
+		<td style="width:35%;">
+			<input  class="form-control"  type="password" id="password" name="password"  title="" value=""/>
+		</td>
+	</tr>
+	<tr>
+			<td style="width:15%;"><@locale code="userinfo.employeeNumber" />:</td>
+			<td style="width:35%;">
+				<input class="form-control"  type="text" id="employeeNumber" name="employeeNumber"  title="" value="${model.employeeNumber!""!""}"/>
+			</td>
+			<td><@locale code="userinfo.userType" />:</td>
+			<td style="width:35%;">
+	
+				<select name="userType"   class="form-control" >
+						<option value="EMPLOYEE"  selected><@locale code="userinfo.userType.employee" /></option>
+						<option value="CONTRACTOR"  selected><@locale code="userinfo.userType.contractor" /></option>
+						<option value="CUSTOMER"  selected><@locale code="userinfo.userType.customer" /></option>
+						<option value="DEALER"  selected><@locale code="userinfo.userType.dealer" /></option>
+						<option value="SUPPLIER"  selected><@locale code="userinfo.userType.supplier" /></option>
+						<option value="PARTNER"  selected><@locale code="userinfo.userType.partner" /></option>
+						<option value="EXTERNAL"  selected><@locale code="userinfo.userType.external" /></option>
+						<option value="INTERN"  selected><@locale code="userinfo.userType.intern" /></option>
+						<option value="TEMP"  selected><@locale code="userinfo.userType.temp" /></option>
+				</select>
+			</td>
+			
+		</tr>
+	<tr>
+		<td colspan="4">&nbsp;
+		</td>
+		
+	</tr>
+	<tr>
+		<td><@locale code="userinfo.displayName" />:</td>
+		<td>
+			<input class="form-control"  type="text" id="displayName" name="displayName"  title="" value="${model.displayName!""}"/>
+		</td>
+		<td rowspan="4"><@locale code="userinfo.picture" />:</td>
+		<td rowspan="4">
+			<img id="picture" width="150px" height="150px" src="<@base/>/static/images/uploadimage.jpg" />
+			<input type="file" id="pictureFile" name="pictureFile" style="display:none" />
+					</td>
+	</tr>
+	<tr>
+		<td><@locale code="userinfo.familyName" />:</td>
+		<td>
+			<input class="form-control"  type="text" id="familyName" name="familyName"  title="" value="${model.familyName!""}"/>
+		</td>
+	</tr>
+	<tr>
+		<td><@locale code="userinfo.givenName" />:</td>
+		<td>
+			<input class="form-control"  type="text" id="givenName" name="givenName"  title="" value="${model.givenName!""}"/>
+		</td>
+	</tr>
+	<tr>
+		<td><@locale code="userinfo.middleName" />:</td>
+		<td>
+			<input class="form-control"  type="text" id="middleName" name="middleName"  title="" value="${model.middleName!""}"/>
+		</td>
+		
+		
+	</tr>
+	<tr>
+		<td><@locale code="userinfo.nickName" />:</td>
+		<td>
+			<input class="form-control"  type="text" id="nickName" name="nickName"  title="" value="${model.nickName!""}"/>
+		</td>
+		<td style="width:15%;"><@locale code="userinfo.windowsAccount" />:</td>
+			<td style="width:35%;">
+				<input class="form-control"  type="text" id="windowsAccount" name="windowsAccount"  title="" value="${model.windowsAccount!""}"/>
+		</td>
+	</tr>
+	<tr>
+		<td><@locale code="userinfo.gender" />:</td>
+		<td>
+			<select name="gender"   class="form-control" >
+					<option value="1"  selected><@locale code="userinfo.gender.female" /></option>
+					<option value="2"  ><@locale code="userinfo.gender.male" /></option>
+			</select>
+		</td>
+		<td><@locale code="userinfo.birthDate" />:</td>
+		<td>
+			<input class="form-control"  type="text" id="birthDate" name="birthDate"  title="" value="${model.birthDate!""}"/>
+		</td>
+	</tr>
+
+	<tr>
+		<td colspan="4">&nbsp;
+		</td>
+		
+	</tr>
+	<tr>
+		<td><@locale code="userinfo.preferredLanguage" />:</td>
+		<td>
+			<select class="form-control"  name="preferredLanguage" id="preferredLanguage">
+				<option value="" selected="selected">Language</option>
+				<option value="en_US"  >English</option>
+				<option value="nl_NL"  >Dutch</option>
+				<option value="fr"     >French</option>
+				<option value="de"     >German</option>
+				<option value="it"     >Italian</option>
+				<option value="es"     >Spanish</option>
+				<option value="sv"     >Swedish</option>
+				<option value="pt_BR"  >Portuguese  (Brazilian)</option>
+				<option value="ja"     >Japanese</option>
+				<option value="zh_CN" selected >Chinese (Simplified)</option>
+				<option value="zh_TW"  >Chinese (Traditional)</option>
+				<option value="ko"     >Korean</option>
+				<option value="th"     >Thai</option>
+				<option value="fi"     >Finnish</option>
+				<option value="ru"     >Russian</option>
+			</select>
+		</td>
+		<td><@locale code="userinfo.timeZone" />:</td>
+		<td nowrap >
+			<select class="form-control"  id="timeZone" name="timeZone" tabindex="61">
+				<option value="Pacific/Kiritimati"   >(GMT+14:00) Line Islands Time (Pacific/Kiritimati)</option>
+				<option value="Pacific/Chatham"      >(GMT+13:45) Chatham Daylight Time (Pacific/Chatham)</option>
+				<option value="Pacific/Auckland"     >(GMT+13:00) New Zealand Daylight Time (Pacific/Auckland)</option>
+				<option value="Pacific/Enderbury"    >(GMT+13:00) Phoenix Islands Time (Pacific/Enderbury)</option>
+				<option value="Pacific/Tongatapu"    >(GMT+13:00) Tonga Time (Pacific/Tongatapu)</option>
+				<option value="Asia/Kamchatka"       >(GMT+12:00) Magadan Time (Asia/Kamchatka)</option>
+				<option value="Pacific/Fiji"         >(GMT+12:00) Fiji Time (Pacific/Fiji)</option>
+				<option value="Pacific/Norfolk"      >(GMT+11:30) Norfolk Islands Time (Pacific/Norfolk)</option>
+				<option value="Australia/Lord_Howe"  >(GMT+11:00) Lord Howe Daylight Time (Australia/Lord_Howe)</option>
+				<option value="Australia/Sydney"     >(GMT+11:00) Australian Eastern Daylight Time (Australia/Sydney)</option>
+				<option value="Pacific/Guadalcanal"  >(GMT+11:00) Solomon Islands Time (Pacific/Guadalcanal)</option>
+				<option value="Australia/Adelaide"   >(GMT+10:30) Australian Central Daylight Time (Australia/Adelaide)</option>
+				<option value="Australia/Brisbane"   >(GMT+10:00) Australian Eastern Standard Time (Australia/Brisbane)</option>
+				<option value="Australia/Darwin"     >(GMT+09:30) Australian Central Standard Time (Australia/Darwin)</option>
+				<option value="Asia/Seoul"           >(GMT+09:00) Korean Standard Time (Asia/Seoul)</option>
+				<option value="Asia/Tokyo"           >(GMT+09:00) Japan Standard Time (Asia/Tokyo)</option>
+				<option value="Asia/Hong_Kong"       >(GMT+08:00) Hong Kong Time (Asia/Hong_Kong)</option>
+				<option value="Asia/Kuala_Lumpur"    >(GMT+08:00) Malaysia Time (Asia/Kuala_Lumpur)</option>
+				<option value="Asia/Manila"          >(GMT+08:00) Philippine Time (Asia/Manila)</option>
+				<option value="Asia/Shanghai" selected >(GMT+08:00) China Standard Time (Asia/Shanghai)</option>
+				<option value="Asia/Singapore"       >(GMT+08:00) Singapore Standard Time (Asia/Singapore)</option>
+				<option value="Asia/Taipei"          >(GMT+08:00) Taipei Standard Time (Asia/Taipei)</option>
+				<option value="Australia/Perth"      >(GMT+08:00) Australian Western Standard Time (Australia/Perth)</option>
+				<option value="Asia/Bangkok"         >(GMT+07:00) Indochina Time (Asia/Bangkok)</option>
+				<option value="Asia/Ho_Chi_Minh"     >(GMT+07:00) Indochina Time (Asia/Ho_Chi_Minh)</option>
+				<option value="Asia/Jakarta"         >(GMT+07:00) Western Indonesia Time (Asia/Jakarta)</option>
+				<option value="Asia/Rangoon"         >(GMT+06:30) Myanmar Time (Asia/Rangoon)</option>
+				<option value="Asia/Dhaka"           >(GMT+06:00) Bangladesh Time (Asia/Dhaka)</option>
+				<option value="Asia/Yekaterinburg"   >(GMT+06:00) Yekaterinburg Time (Asia/Yekaterinburg)</option>
+				<option value="Asia/Kathmandu"       >(GMT+05:45) Nepal Time (Asia/Kathmandu)</option>
+				<option value="Asia/Colombo"         >(GMT+05:30) India Standard Time (Asia/Colombo)</option>
+				<option value="Asia/Kolkata"         >(GMT+05:30) India Standard Time (Asia/Kolkata)</option>
+				<option value="Asia/Baku"            >(GMT+05:00) Azerbaijan Summer Time (Asia/Baku)</option>
+				<option value="Asia/Karachi"         >(GMT+05:00) Pakistan Time (Asia/Karachi)</option>
+				<option value="Asia/Tashkent"        >(GMT+05:00) Uzbekistan Time (Asia/Tashkent)</option>
+				<option value="Asia/Kabul"           >(GMT+04:30) Afghanistan Time (Asia/Kabul)</option>
+				<option value="Asia/Dubai"           >(GMT+04:00) Gulf Standard Time (Asia/Dubai)</option>
+				<option value="Asia/Tbilisi"         >(GMT+04:00) Georgia Time (Asia/Tbilisi)</option>
+				<option value="Asia/Yerevan"         >(GMT+04:00) Armenia Time (Asia/Yerevan)</option>
+				<option value="Europe/Moscow"        >(GMT+04:00) Moscow Standard Time (Europe/Moscow)</option>
+				<option value="Asia/Tehran"          >(GMT+03:30) Iran Standard Time (Asia/Tehran)</option>
+				<option value="Africa/Nairobi"       >(GMT+03:00) East Africa Time (Africa/Nairobi)</option>
+				<option value="Asia/Baghdad"         >(GMT+03:00) Arabian Standard Time (Asia/Baghdad)</option>
+				<option value="Asia/Beirut"          >(GMT+03:00) Eastern European Summer Time (Asia/Beirut)</option>
+				<option value="Asia/Jerusalem"       >(GMT+03:00) Israel Daylight Time (Asia/Jerusalem)</option>
+				<option value="Asia/Kuwait"          >(GMT+03:00) Arabian Standard Time (Asia/Kuwait)</option>
+				<option value="Asia/Riyadh"          >(GMT+03:00) Arabian Standard Time (Asia/Riyadh)</option>
+				<option value="Europe/Athens"        >(GMT+03:00) Eastern European Summer Time (Europe/Athens)</option>
+				<option value="Europe/Bucharest"     >(GMT+03:00) Eastern European Summer Time (Europe/Bucharest)</option>
+				<option value="Europe/Helsinki"      >(GMT+03:00) Eastern European Summer Time (Europe/Helsinki)</option>
+				<option value="Europe/Istanbul"      >(GMT+03:00) Eastern European Summer Time (Europe/Istanbul)</option>
+				<option value="Europe/Minsk"         >(GMT+03:00) Further-eastern European Time (Europe/Minsk)</option>
+				<option value="Africa/Cairo"         >(GMT+02:00) Eastern European Time (Africa/Cairo)</option>
+				<option value="Africa/Johannesburg"  >(GMT+02:00) South Africa Standard Time (Africa/Johannesburg)</option>
+				<option value="Europe/Amsterdam"     >(GMT+02:00) Central European Summer Time (Europe/Amsterdam)</option>
+				<option value="Europe/Berlin"        >(GMT+02:00) Central European Summer Time (Europe/Berlin)</option>
+				<option value="Europe/Brussels"      >(GMT+02:00) Central European Summer Time (Europe/Brussels)</option>
+				<option value="Europe/Paris"         >(GMT+02:00) Central European Summer Time (Europe/Paris)</option>
+				<option value="Europe/Prague"        >(GMT+02:00) Central European Summer Time (Europe/Prague)</option>
+				<option value="Europe/Rome"          >(GMT+02:00) Central European Summer Time (Europe/Rome)</option>
+				<option value="Africa/Algiers"       >(GMT+01:00) Central European Time (Africa/Algiers)</option>
+				<option value="Europe/Dublin"        >(GMT+01:00) Irish Summer Time (Europe/Dublin)</option>
+				<option value="Europe/Lisbon"        >(GMT+01:00) Western European Summer Time (Europe/Lisbon)</option>
+				<option value="Europe/London"        >(GMT+01:00) British Summer Time (Europe/London)</option>
+				<option value="Africa/Casablanca"    >(GMT+00:00) Western European Time (Africa/Casablanca)</option>
+				<option value="America/Scoresbysund" >(GMT+00:00) East Greenland Summer Time (America/Scoresbysund)</option>
+				<option value="Atlantic/Azores"      >(GMT+00:00) Azores Summer Time (Atlantic/Azores)</option>
+				<option value="GMT"                  >(GMT+00:00) Greenwich Mean Time (GMT)</option>
+				<option value="Atlantic/Cape_Verde"  >(GMT-01:00) Cape Verde Time (Atlantic/Cape_Verde)</option>
+				<option value="Atlantic/South_Georgia" >(GMT-02:00) South Georgia Time (Atlantic/South_Georgia)</option>
+				<option value="America/St_Johns"      >(GMT-02:30) Newfoundland Daylight Time (America/St_Johns)</option>
+				<option value="America/Argentina/Buenos_Aires" >(GMT-03:00) Argentina Time (America/Argentina/Buenos_Aires)</option>
+				<option value="America/Halifax"      >(GMT-03:00) Atlantic Daylight Time (America/Halifax)</option>
+				<option value="America/Santiago"     >(GMT-03:00) Chile Summer Time (America/Santiago)</option>
+				<option value="America/Sao_Paulo"    >(GMT-03:00) Brasilia Time (America/Sao_Paulo)</option>
+				<option value="Atlantic/Bermuda"     >(GMT-03:00) Atlantic Daylight Time (Atlantic/Bermuda)</option>
+				<option value="America/Indiana/Indianapolis" >(GMT-04:00) Eastern Daylight Time (America/Indiana/Indianapolis)</option>
+				<option value="America/New_York"     >(GMT-04:00) Eastern Daylight Time (America/New_York)</option>
+				<option value="America/Puerto_Rico"  >(GMT-04:00) Atlantic Standard Time (America/Puerto_Rico)</option>
+				<option value="America/Caracas"      >(GMT-04:30) Venezuela Time (America/Caracas)</option>
+				<option value="America/Bogota"       >(GMT-05:00) Colombia Time (America/Bogota)</option>
+				<option value="America/Chicago"      >(GMT-05:00) Central Daylight Time (America/Chicago)</option>
+				<option value="America/Lima"         >(GMT-05:00) Peru Time (America/Lima)</option>
+				<option value="America/Mexico_City"  >(GMT-05:00) Central Daylight Time (America/Mexico_City)</option>
+				<option value="America/Panama"       >(GMT-05:00) Eastern Standard Time (America/Panama)</option>
+				<option value="America/Denver"       >(GMT-06:00) Mountain Daylight Time (America/Denver)</option>
+				<option value="America/El_Salvador"  >(GMT-06:00) Central Standard Time (America/El_Salvador)</option>
+				<option value="America/Mazatlan"     >(GMT-06:00) Mountain Daylight Time (America/Mazatlan)</option>
+				<option value="America/Los_Angeles"  >(GMT-07:00) Pacific Daylight Time (America/Los_Angeles)</option>
+				<option value="America/Phoenix"      >(GMT-07:00) Mountain Standard Time (America/Phoenix)</option>
+				<option value="America/Tijuana"      >(GMT-07:00) Pacific Daylight Time (America/Tijuana)</option>
+				<option value="America/Anchorage"    >(GMT-08:00) Alaska Daylight Time (America/Anchorage)</option>
+				<option value="Pacific/Pitcairn"     >(GMT-08:00) Pitcairn Time (Pacific/Pitcairn)</option>
+				<option value="America/Adak"         >(GMT-09:00) Hawaii-Aleutian Standard Time (America/Adak)</option>
+				<option value="Pacific/Gambier"      >(GMT-09:00) Gambier Time (Pacific/Gambier)</option>
+				<option value="Pacific/Marquesas"    >(GMT-09:30) Marquesas Time (Pacific/Marquesas)</option>
+				<option value="Pacific/Honolulu"     >(GMT-10:00) Hawaii-Aleutian Standard Time (Pacific/Honolulu)</option>
+				<option value="Pacific/Niue"         >(GMT-11:00) Niue Time (Pacific/Niue)</option>
+				<option value="Pacific/Pago_Pago"    >(GMT-11:00) Samoa Standard Time (Pacific/Pago_Pago)</option>
+			</select>
+		</td>
+	</tr>
+	</tbody>
+ </table>
+ <table  class="table table-bordered"  style="display:none" id="table_switch_company" width="980">
+	<tbody>				
+		<tr>
+			<td style="width:15%;"><@locale code="userinfo.organization" />:</td>
+			<td style="width:35%;">
+				<input class="form-control"  type="text" id="organization" name="organization"  title="" value="${model.organization!""}"/>
+			</td>
+			<td style="width:15%;"><@locale code="userinfo.division" />:</td>
+			<td style="width:35%;">
+				<input class="form-control"  type="text" id="division" name="division"  title="" value="${model.division!""}"/>
+			</td>
+			
+		</tr>
+		
+		<tr>
+			<td><@locale code="userinfo.department" />:</td>
+			<td>
+				<input class="form-control"  type="hidden" id="departmentId" name="departmentId"  title="" value="${model.departmentId!""}"/>
+				<input class="form-control"  type="text" style="width:70%"  id="department" name="department"  title="" value="${model.department!""}"/>
+				<s:Dialog text="button.text.select" title="department" url="/orgs/orgsSelect/deptId/department" width="300" height="400" />
+			</td>
+			<td><@locale code="userinfo.costCenter" />:</td>
+			<td>
+				<input class="form-control"  type="text" id="costCenter" name="costCenter"  title="" value="${model.costCenter!""}"/>
+			</td>
+			
+		</tr>
+		<tr>
+			<td><@locale code="userinfo.jobTitle" />:</td>
+			<td>
+				<input class="form-control"  type="text" id="jobTitle" name="jobTitle"  title="" value="${model.jobTitle!""}"/>
+			</td>
+			<td><@locale code="userinfo.jobLevel" />:</td>
+			<td>
+				<input class="form-control"  type="text" id="jobLevel" name="jobLevel"  title="" value="${model.jobLevel!""}"/>
+			</td>
+		</tr>
+		<tr>
+			<td><@locale code="userinfo.manager" />:</td>
+			<td>
+				<input class="form-control"  type="hidden" id="managerId" name="managerId"  title="" value="${model.managerId!""}"/>
+				<input class="form-control"  type="text" id="manager" name="manager"  title="" value="${model.manager!""}"/>
+			</td>
+			<td><@locale code="userinfo.assistant" />:</td>
+			<td>
+				<input class="form-control"  type="hidden" id="assistantId" name="assistantId"  title="" value="${model.assistantId!""}"/>
+				<input class="form-control"   type="text" id="assistant" name="assistant"  title="" value="${model.assistant!""}"/>
+			</td>
+		</tr>
+		<tr>
+			<td><@locale code="userinfo.entryDate" />:</td>
+			<td>
+				<input class="form-control"  type="text" id="entryDate" name="entryDate"  title="" value="${model.entryDate!""}"/>
+			</td>
+			<td><@locale code="userinfo.quitDate" />:</td>
+			<td>
+				<input class="form-control"   type="text" id="quitDate" name="quitDate"  title="" value="${model.quitDate!""}"/>
+			</td>
+		</tr>
+		<tr>
+			<td colspan="4">&nbsp;
+			</td>
+			
+		</tr>
+		<tr>
+			<td><@locale code="userinfo.workCountry" />:</td>
+			<td nowrap >
+				<input class="form-control"   type="text" id="workCountry" name="workCountry"  title="" value="${model.workCountry!""}"/>
+			</td>
+			<td><@locale code="userinfo.workRegion" />:</td>
+			<td>
+				<input class="form-control"  type="text" id="workRegion" name="workRegion"  title="" value="${model.workRegion!""}"/>
+			</td>
+		</tr>
+		<tr>
+			<td><@locale code="userinfo.workLocality" />:</td>
+			<td>
+				<input class="form-control"  type="text" id="workLocality" name="workLocality"  title="" value="${model.workLocality!""}"/>
+			</td>
+			<td><@locale code="userinfo.workStreetAddress" />:</td>
+			<td>
+				<input class="form-control"  type="text" id="workStreetAddress" name="workStreetAddress"  title="" value="${model.workStreetAddress!""}"/>
+			</td>
+		</tr>
+		<tr>
+			
+			<td><@locale code="userinfo.workPostalCode" />:</td>
+			<td>
+				<input class="form-control"  type="text" id="workPostalCode" name="workPostalCode"  title="" value="${model.workPostalCode!""}"/>
+			</td>
+			<td><@locale code="userinfo.workFax" />:</td>
+			<td>
+				<input class="form-control"  type="text" id="workFax" name="workFax"  title="" value="${model.workFax!""}"/>
+			</td>
+		</tr>
+
+		<tr>
+			<td><@locale code="userinfo.workPhoneNumber" />:</td>
+			<td>
+				<input class="form-control"  type="text" id="workPhoneNumber" name="workPhoneNumber"  title="" value="${model.workPhoneNumber!""}"/>
+			</td>
+			<td><@locale code="userinfo.workEmail" />:</td>
+			<td>
+				<input class="form-control"  type="text" id="workEmail" name="workEmail"  title="" value="${model.workEmail!""}"/>
+			</td>
+		</tr>
+		<tr>
+			<td colspan="4">&nbsp;
+			</td>
+			
+		</tr>					
+	</tbody>
+</table>
+<table  class="table table-bordered"  style="display:none" id="table_switch_home" width="980">
+	<tbody>				
+		<tr>
+			<td style="width:15%;"><@locale code="userinfo.idtype" />:</td>
+			<td style="width:35%;">
+				<select name="idType"   class="form-control" >
+					<option value="UNKNOWN" selected ><@locale code="userinfo.idtype.unknown" /></option>
+					<option value="IDCARD"  ><@locale code="userinfo.idtype.idcard" /></option>
+					<option value="PASSPORT"  ><@locale code="userinfo.idtype.passport" /></option>
+					<option value="STUDENTCARD"  ><@locale code="userinfo.idtype.studentcard" /></option>
+					<option value="MILITARYCARD"  ><@locale code="userinfo.idtype.militarycard" /></option>
+				</select>
+			</td>
+			
+			<td style="width:15%;"><@locale code="userinfo.idCardNo" />:</td>
+			<td style="width:35%;">
+				<input class="form-control"  type="text" id="idCardNo" name="idCardNo"  title="" value="${model.idCardNo!""}"/>
+
+			</td>
+		</tr>
+		<tr>
+			
+			<td><@locale code="userinfo.married" />:</td>
+			<td>
+				<select name="married"  class="form-control" >
+					<option value="UNKNOWN" selected><@locale code="userinfo.married.unknown" /></option>
+					<option value="SINGLE" ><@locale code="userinfo.married.single" /></option>
+					<option value="MARRIED" ><@locale code="userinfo.married.married" /></option>
+					<option value="DIVORCE" ><@locale code="userinfo.married.divorce" /></option>
+					<option value="WIDOWED" ><@locale code="userinfo.married.widowed" /></option>
+				</select>
+			</td>
+			<td><@locale code="userinfo.startWorkDate" />:</td>
+			<td>
+				<input class="form-control"  type="text" id="startWorkDate" name="startWorkDate"  title="" value="${model.startWorkDate!""}"/>
+			</td>
+		</tr>
+		<tr>
+			<td colspan="4">&nbsp;
+			</td>
+			
+		</tr>
+		
+		<tr>
+			<td><@locale code="userinfo.homeCountry" />:</td>
+			<td>
+				<input class="form-control"  type="text" id="homeCountry" name="homeCountry"  title="" value="${model.homeCountry!""}"/>
+			</td>
+			<td><@locale code="userinfo.homeRegion" />:</td>
+			<td>
+				<input class="form-control"  type="text" id="homeRegion" name="homeRegion"  title="" value="${model.homeRegion!""}"/>
+			</td>
+		</tr>
+		<tr>
+			
+			<td><@locale code="userinfo.homeLocality" />:</td>
+			<td>
+				<input class="form-control"  type="text" id="homeLocality" name="homeLocality"  title="" value="${model.homeLocality!""}"/>
+			</td>
+			<td><@locale code="userinfo.homeStreetAddress" />:</td>
+			<td>
+				<input class="form-control"  type="text" id="homeStreetAddress" name="homeStreetAddress"  title="" value="${model.homeStreetAddress!""}"/>
+			</td>
+		</tr>
+		<tr>
+			
+			<td><@locale code="userinfo.homePostalCode" />:</td>
+			<td>
+				<input class="form-control"  type="text" id="homePostalCode" name="homePostalCode"  title="" value="${model.homePostalCode!""}"/>
+			</td>
+			<td><@locale code="userinfo.homeFax" />:</td>
+			<td>
+				<input class="form-control"  type="text" id="homeFax" name="homeFax"  title="" value="${model.homeFax!""}"/>
+			</td>
+		</tr>
+		
+		<tr>
+			<td><@locale code="userinfo.homePhoneNumber" />:</td>
+			<td>
+				<input class="form-control"  type="text" id="homePhoneNumber" name="homePhoneNumber"  title="" value="${model.homePhoneNumber!""}"/>
+			</td>
+			<td><@locale code="userinfo.homeEmail" />:</td>
+			<td >
+				<input class="form-control"  type="text" id="homeEmail" name="homeEmail"  title="" value="${model.homeEmail!""}"/>
+			</td>
+		</tr>
+		<tr>
+			<td colspan="4">&nbsp;
+			</td>
+			
+		</tr>
+				<tr>
+					<td><@locale code="userinfo.website" />:</td>
+					<td>
+						<input  class="form-control"   type="text" id="webSite" name="webSite"  title="" value="${model.webSite!""}"/>
+					</td>
+					<td><@locale code="userinfo.ims" />:</td>
+					<td >
+						<input class="form-control"  type="text" id="defineIm" name="defineIm"  title="" value="${model.defineIm!""}"/>
+					</td>
+				</tr>
+	</tbody>
+</table>
+  	        <div class="clear"></div>
+		</div>
+		</div>
+			<div >
+				<div >
+					<input id="_method" type="hidden" name="_method"  value="post"/>
+					<input id="submitBtn" class="button btn btn-primary mr-3" type="button" value="<@locale code="button.text.save" />"/>
+				</div>
+			</div>
+	 </div> 
+</form>
+</body>
+</html>

+ 0 - 54
maxkey-web-manage/src/main/resources/templates/views/userinfo/userUpdate.jsp

@@ -1,54 +0,0 @@
-<%@ page   language="java"    import="java.util.*"   pageEncoding="UTF-8"%>
-<%@ page   import="org.maxkey.web.*"%>
-<%@ taglib prefix="s"  uri="http://www.connsec.com/tags" %>
-<%@ taglib prefix="spring"	  uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="fmt"		  uri="http://java.sun.com/jsp/jstl/fmt"%>
-<%@ taglib prefix="c"		  uri="http://java.sun.com/jsp/jstl/core" %>
-
-<script type="text/javascript">
-   <!--
-      $(function(){	
-      	$("#picture").on("click",function(){
-      		$("#pictureFile").click();
-      	});
-      });
-      //-->
-</script>
-
-<form 
-	method="post"
-	type="alert"  
-	action="<s:Base/>/users/update" 
-	autoclose="true" 
-	enctype="multipart/form-data">
-	 <div class="" style="width:100%;">
-		<div class="top">
-			<ul class="switch_tab"  style="width:100%" >
-				<li id="switch_basic" value="table_switch_basic" style="width:24%" class="switch_tab_class switch_tab_current"><a href="javascript:void(0);"><s:Locale code="userinfo.tab.basic" /></a></li>
-				<li id="switch_company"  value="table_switch_company" style="width:24%" class="switch_tab_class"><a href="javascript:void(0);"><s:Locale code="userinfo.tab.business" /></a></li>
-				<li id="switch_home"  value="table_switch_home" style="width:24%" class="switch_tab_class"><a href="javascript:void(0);"><s:Locale code="userinfo.tab.personal" /></a></li>
-				<li id="switch_extra"  value="table_switch_extra" style="width:24%" class="switch_tab_class"><a href="javascript:void(0);"><s:Locale code="userinfo.tab.extra" /></a></li>
-			
-			</ul>
-		</div>
-
-	    <div class="main">
-	    <div class="mainin">			 
-  	        <!-- content -->    
-  	      	<!--table-->
-			   <%@ include file="userUpdateBasic.jsp"%> 
-			   <%@ include file="userUpdateCompany.jsp"%> 
-			   <%@ include file="userUpdateHome.jsp"%> 
-  	        <div class="clear"></div>
-		</div>
-		</div>
-			<div >
-				<div >
-					<input id="status" type="hidden" name="status"  value="${model.status}"/>
-					<input id="_method" type="hidden" name="_method"  value="post"/>
-					<input id="submitBtn" class="button" type="submit" value="<s:Locale code="button.text.save" />"/>
-					<input id="closeBtn"  class="button"  type="button" value="<s:Locale code="button.text.cancel" />"/>		  
-				</div>
-			</div>
-	 </div> 
-</form>

+ 0 - 254
maxkey-web-manage/src/main/resources/templates/views/userinfo/userUpdateBasic.jsp

@@ -1,254 +0,0 @@
-<%@ page   language="java"    import="java.util.*"   pageEncoding="UTF-8"%>
-<%@ page   import="org.maxkey.web.*"%>
-<%@ taglib prefix="s"  uri="http://www.connsec.com/tags" %>
-<%@ taglib prefix="spring"	  uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="fmt"		  uri="http://java.sun.com/jsp/jstl/fmt"%>
-<%@ taglib prefix="c"		  uri="http://java.sun.com/jsp/jstl/core" %>
-
-<table class="datatable"  id="table_switch_basic" width="980">
-	<tbody>				
-		<tr>
-			<th style="width:15%;"><s:Locale code="userinfo.username" />:</th>
-			<td style="width:35%;">
-			<input type="hidden" id="id" name="id" value="${model.id}"/>
-				<input readonly type="text" id="username" name="username"  title="" value="${model.username}"/>
-				<label for="username"></label>
-			</td>
-			<th style="width:15%;"><s:Locale code="userinfo.userType" />:</th>
-			<td style="width:35%;">
-				<c:forEach items="${userTypeList}" var="userType">
-					<c:if test="${model.userType  eq userType.id}"><input readonly type="text" id="userType" name="userType"  title="" value="${userType.name}"/></c:if>
-		      	</c:forEach>
-			</td>
-		</tr>
-		<tr>
-			<td colspan="4">&nbsp;
-			</td>
-			
-		</tr>
-		<tr>
-			<th><s:Locale code="userinfo.displayName" />:</th>
-			<td>
-				<input type="text" id="displayName" name="displayName"  title="" value="${model.displayName}"/>
-				<b class="orange">*</b><label for="displayName"></label>
-			</td>
-			<th rowspan="4"><s:Locale code="userinfo.picture" />:</th>
-			<td rowspan="4" >
-				<c:if test="${null==model.picture}">
-					<img id="picture" width="150px" height="150px" src="<c:url value="/images/uploadimage.jpg"/>" />
-				</c:if>
-				<c:if test="${null!=model.picture}">
-				<img id="picture" width="150px" height="150px" src="<c:url value="/image/${model.id}"/>" />
-				</c:if>
-				<input type="file" id="pictureFile" name="pictureFile" style="display:none" />
-				<label for="picture"></label>
-			</td>
-		</tr>
-		<tr>
-			<th><s:Locale code="userinfo.familyName" />:</th>
-			<td>
-				<input type="text" id="familyName" name="familyName"  title="" value="${model.familyName}"/>
-				<b class="orange">*</b><label for="familyName"></label>
-			</td>
-			
-			
-			
-		</tr>
-		<tr>
-			<th><s:Locale code="userinfo.givenName" />:</th>
-			<td>
-				<input type="text" id="givenName" name="givenName"  title="" value="${model.givenName}"/>
-				<b class="orange">*</b><label for="givenName"></label>
-			</td>
-			
-			
-		</tr>
-		<tr>
-			<th><s:Locale code="userinfo.middleName" />:</th>
-			<td>
-				<input type="text" id="middleName" name="middleName"  title="" value="${model.middleName}"/>
-				<label for="middleName"></label>
-			</td>
-			
-			
-		</tr>
-		<tr>
-			
-			<th><s:Locale code="userinfo.nickName" />:</th>
-			<td>
-				<input type="text" id="nickName" name="nickName"  title="" value="${model.nickName}"/>
-				<label for="nickName"></label>
-			</td>
-			<th><s:Locale code="userinfo.gender" />:</th>
-			<td>
-				<select name="gender"  class="gender">
-						<option value="1"  <c:if test="${1==model.gender}">selected</c:if> ><s:Locale code="userinfo.gender.female" /></option>
-						<option value="2"  <c:if test="${2==model.gender}">selected</c:if> ><s:Locale code="userinfo.gender.male" /></option>
-				</select>
-				<label for="gender"></label>
-			</td>
-		</tr>
-		<tr>
-			<td colspan="4">&nbsp;
-			</td>
-			
-		</tr>
-		<tr>
-			<th><s:Locale code="userinfo.webSite" />:</th>
-			<td>
-				<input type="text" id="webSite" name="webSite"  title="" value="${model.webSite}"/>
-				<label for="webSite"></label>
-				
-			</td>
-			<th><s:Locale code="userinfo.preferredLanguage" />:</th>
-			<td>
-				<select name="preferredLanguage" id="preferredLanguage">
-					<option value=""       >Language</option>
-					<option value="en_US"  <c:if test="${'en_US'==model.preferredLanguage}">selected</c:if>  >English</option>
-					<option value="nl_NL"  <c:if test="${'nl_NL'==model.preferredLanguage}">selected</c:if>  >Dutch</option>
-					<option value="fr"     <c:if test="${'fr'==model.preferredLanguage}">selected</c:if>  >French</option>
-					<option value="de"     <c:if test="${'de'==model.preferredLanguage}">selected</c:if>  >German</option>
-					<option value="it"     <c:if test="${'it'==model.preferredLanguage}">selected</c:if>  >Italian</option>
-					<option value="es"     <c:if test="${'es'==model.preferredLanguage}">selected</c:if>  >Spanish</option>
-					<option value="sv"     <c:if test="${'sv'==model.preferredLanguage}">selected</c:if>  >Swedish</option>
-					<option value="pt_BR"  <c:if test="${'pt_BR'==model.preferredLanguage}">selected</c:if>  >Portuguese  (Brazilian)</option>
-					<option value="ja"     <c:if test="${'ja'==model.preferredLanguage}">selected</c:if>  >Japanese</option>
-					<option value="zh_CN"  <c:if test="${'zh_CN'==model.preferredLanguage}">selected</c:if>  >Chinese (Simplified)</option>
-					<option value="zh_TW"  <c:if test="${'zh_TW'==model.preferredLanguage}">selected</c:if>  >Chinese (Traditional)</option>
-					<option value="ko"     <c:if test="${'ko'==model.preferredLanguage}">selected</c:if>  >Korean</option>
-					<option value="th"     <c:if test="${'th'==model.preferredLanguage}">selected</c:if>  >Thai</option>
-					<option value="fi"     <c:if test="${'fi'==model.preferredLanguage}">selected</c:if>  >Finnish</option>
-					<option value="ru"     <c:if test="${'ru'==model.preferredLanguage}">selected</c:if>  >Russian</option>
-				</select>
-			</td>
-		</tr>
-		<tr>
-			<th><s:Locale code="userinfo.timeZone" />:</th>
-			<td>
-				<select id="timeZone" name="timeZone" tabindex="61">
-					<option value="Pacific/Kiritimati"   <c:if test="${'Pacific/Kiritimati'==model.timeZone}">selected</c:if>>(GMT+14:00) Line Islands Time (Pacific/Kiritimati)</option>
-					<option value="Pacific/Chatham"      <c:if test="${'Pacific/Chatham'==model.timeZone}">selected</c:if>>(GMT+13:45) Chatham Daylight Time (Pacific/Chatham)</option>
-					<option value="Pacific/Auckland"     <c:if test="${'Pacific/Auckland'==model.timeZone}">selected</c:if>>(GMT+13:00) New Zealand Daylight Time (Pacific/Auckland)</option>
-					<option value="Pacific/Enderbury"    <c:if test="${'Pacific/Enderbury'==model.timeZone}">selected</c:if>>(GMT+13:00) Phoenix Islands Time (Pacific/Enderbury)</option>
-					<option value="Pacific/Tongatapu"    <c:if test="${'Pacific/Tongatapu'==model.timeZone}">selected</c:if>>(GMT+13:00) Tonga Time (Pacific/Tongatapu)</option>
-					<option value="Asia/Kamchatka"       <c:if test="${'Asia/Kamchatkai'==model.timeZone}">selected</c:if>>(GMT+12:00) Magadan Time (Asia/Kamchatka)</option>
-					<option value="Pacific/Fiji"         <c:if test="${'Pacific/Fiji'==model.timeZone}">selected</c:if>>(GMT+12:00) Fiji Time (Pacific/Fiji)</option>
-					<option value="Pacific/Norfolk"      <c:if test="${'Pacific/Norfolk'==model.timeZone}">selected</c:if>>(GMT+11:30) Norfolk Islands Time (Pacific/Norfolk)</option>
-					<option value="Australia/Lord_Howe"  <c:if test="${'Australia/Lord_Howe'==model.timeZone}">selected</c:if>>(GMT+11:00) Lord Howe Daylight Time (Australia/Lord_Howe)</option>
-					<option value="Australia/Sydney"     <c:if test="${'Australia/Sydney'==model.timeZone}">selected</c:if>>(GMT+11:00) Australian Eastern Daylight Time (Australia/Sydney)</option>
-					<option value="Pacific/Guadalcanal"  <c:if test="${'Australia/Sydney'==model.timeZone}">selected</c:if> >(GMT+11:00) Solomon Islands Time (Pacific/Guadalcanal)</option>
-					<option value="Australia/Adelaide"   <c:if test="${'Australia/Adelaide'==model.timeZone}">selected</c:if>>(GMT+10:30) Australian Central Daylight Time (Australia/Adelaide)</option>
-					<option value="Australia/Brisbane"   <c:if test="${'Australia/Brisbane'==model.timeZone}">selected</c:if>>(GMT+10:00) Australian Eastern Standard Time (Australia/Brisbane)</option>
-					<option value="Australia/Darwin"     <c:if test="${'Australia/Darwin'==model.timeZone}">selected</c:if>>(GMT+09:30) Australian Central Standard Time (Australia/Darwin)</option>
-					<option value="Asia/Seoul"           <c:if test="${'Asia/Seoul'==model.timeZone}">selected</c:if>>(GMT+09:00) Korean Standard Time (Asia/Seoul)</option>
-					<option value="Asia/Tokyo"           <c:if test="${'Asia/Tokyo'==model.timeZone}">selected</c:if>>(GMT+09:00) Japan Standard Time (Asia/Tokyo)</option>
-					<option value="Asia/Hong_Kong"       <c:if test="${'Asia/Hong_Kong'==model.timeZone}">selected</c:if>>(GMT+08:00) Hong Kong Time (Asia/Hong_Kong)</option>
-					<option value="Asia/Kuala_Lumpur"    <c:if test="${'Asia/Kuala_Lumpur'==model.timeZone}">selected</c:if>>(GMT+08:00) Malaysia Time (Asia/Kuala_Lumpur)</option>
-					<option value="Asia/Manila"          <c:if test="${'Asia/Manila'==model.timeZone}">selected</c:if>>(GMT+08:00) Philippine Time (Asia/Manila)</option>
-					<option value="Asia/Shanghai"        <c:if test="${'Asia/Shanghai'==model.timeZone}">selected</c:if>>(GMT+08:00) China Standard Time (Asia/Shanghai)</option>
-					<option value="Asia/Singapore"       <c:if test="${'Asia/Singapore'==model.timeZone}">selected</c:if>>(GMT+08:00) Singapore Standard Time (Asia/Singapore)</option>
-					<option value="Asia/Taipei"          <c:if test="${'Asia/Taipei'==model.timeZone}">selected</c:if> >(GMT+08:00) Taipei Standard Time (Asia/Taipei)</option>
-					<option value="Australia/Perth"      <c:if test="${'Australia/Perth'==model.timeZone}">selected</c:if>>(GMT+08:00) Australian Western Standard Time (Australia/Perth)</option>
-					<option value="Asia/Bangkok"         <c:if test="${'Asia/Bangkok'==model.timeZone}">selected</c:if>>(GMT+07:00) Indochina Time (Asia/Bangkok)</option>
-					<option value="Asia/Ho_Chi_Minh"     <c:if test="${'Asia/Ho_Chi_Minh'==model.timeZone}">selected</c:if>>(GMT+07:00) Indochina Time (Asia/Ho_Chi_Minh)</option>
-					<option value="Asia/Jakarta"         <c:if test="${'Asia/Jakarta'==model.timeZone}">selected</c:if>>(GMT+07:00) Western Indonesia Time (Asia/Jakarta)</option>
-					<option value="Asia/Rangoon"         <c:if test="${'Asia/Rangoon'==model.timeZone}">selected</c:if>>(GMT+06:30) Myanmar Time (Asia/Rangoon)</option>
-					<option value="Asia/Dhaka"           <c:if test="${'Asia/Dhaka'==model.timeZone}">selected</c:if>>(GMT+06:00) Bangladesh Time (Asia/Dhaka)</option>
-					<option value="Asia/Yekaterinburg"   <c:if test="${'Asia/Yekaterinburg'==model.timeZone}">selected</c:if>>(GMT+06:00) Yekaterinburg Time (Asia/Yekaterinburg)</option>
-					<option value="Asia/Kathmandu"       <c:if test="${'Asia/Kathmandu'==model.timeZone}">selected</c:if>>(GMT+05:45) Nepal Time (Asia/Kathmandu)</option>
-					<option value="Asia/Colombo"         <c:if test="${'Asia/Colombo'==model.timeZone}">selected</c:if>>(GMT+05:30) India Standard Time (Asia/Colombo)</option>
-					<option value="Asia/Kolkata"         <c:if test="${'Asia/Kolkata'==model.timeZone}">selected</c:if>>(GMT+05:30) India Standard Time (Asia/Kolkata)</option>
-					<option value="Asia/Baku"            <c:if test="${'Asia/Baku'==model.timeZone}">selected</c:if>>(GMT+05:00) Azerbaijan Summer Time (Asia/Baku)</option>
-					<option value="Asia/Karachi"         <c:if test="${'Asia/Karachi'==model.timeZone}">selected</c:if>>(GMT+05:00) Pakistan Time (Asia/Karachi)</option>
-					<option value="Asia/Tashkent"        <c:if test="${'Asia/Tashkent'==model.timeZone}">selected</c:if>>(GMT+05:00) Uzbekistan Time (Asia/Tashkent)</option>
-					<option value="Asia/Kabul"           <c:if test="${'Asia/Kabul'==model.timeZone}">selected</c:if>>(GMT+04:30) Afghanistan Time (Asia/Kabul)</option>
-					<option value="Asia/Dubai"           <c:if test="${'Asia/Dubai'==model.timeZone}">selected</c:if>>(GMT+04:00) Gulf Standard Time (Asia/Dubai)</option>
-					<option value="Asia/Tbilisi"         <c:if test="${'Asia/Tbilisi'==model.timeZone}">selected</c:if>>(GMT+04:00) Georgia Time (Asia/Tbilisi)</option>
-					<option value="Asia/Yerevan"         <c:if test="${'Asia/Yerevan'==model.timeZone}">selected</c:if>>(GMT+04:00) Armenia Time (Asia/Yerevan)</option>
-					<option value="Europe/Moscow"        <c:if test="${'Europe/Moscow'==model.timeZone}">selected</c:if>>(GMT+04:00) Moscow Standard Time (Europe/Moscow)</option>
-					<option value="Asia/Tehran"          <c:if test="${'Asia/Tehran'==model.timeZone}">selected</c:if>>(GMT+03:30) Iran Standard Time (Asia/Tehran)</option>
-					<option value="Africa/Nairobi"       <c:if test="${'Africa/Nairobi'==model.timeZone}">selected</c:if>>(GMT+03:00) East Africa Time (Africa/Nairobi)</option>
-					<option value="Asia/Baghdad"         <c:if test="${'Asia/Baghdad'==model.timeZone}">selected</c:if>>(GMT+03:00) Arabian Standard Time (Asia/Baghdad)</option>
-					<option value="Asia/Beirut"          <c:if test="${'Asia/Beirut'==model.timeZone}">selected</c:if>>(GMT+03:00) Eastern European Summer Time (Asia/Beirut)</option>
-					<option value="Asia/Jerusalem"       <c:if test="${'Asia/Jerusalem'==model.timeZone}">selected</c:if>>(GMT+03:00) Israel Daylight Time (Asia/Jerusalem)</option>
-					<option value="Asia/Kuwait"          <c:if test="${'Asia/Kuwait'==model.timeZone}">selected</c:if>>(GMT+03:00) Arabian Standard Time (Asia/Kuwait)</option>
-					<option value="Asia/Riyadh"          <c:if test="${'Asia/Riyadh'==model.timeZone}">selected</c:if>>(GMT+03:00) Arabian Standard Time (Asia/Riyadh)</option>
-					<option value="Europe/Athens"        <c:if test="${'Europe/Athens'==model.timeZone}">selected</c:if>>(GMT+03:00) Eastern European Summer Time (Europe/Athens)</option>
-					<option value="Europe/Bucharest"     <c:if test="${'Europe/Bucharest'==model.timeZone}">selected</c:if>>(GMT+03:00) Eastern European Summer Time (Europe/Bucharest)</option>
-					<option value="Europe/Helsinki"      <c:if test="${'Europe/Helsinki'==model.timeZone}">selected</c:if>>(GMT+03:00) Eastern European Summer Time (Europe/Helsinki)</option>
-					<option value="Europe/Istanbul"      <c:if test="${'Europe/Istanbul'==model.timeZone}">selected</c:if>>(GMT+03:00) Eastern European Summer Time (Europe/Istanbul)</option>
-					<option value="Europe/Minsk"         <c:if test="${'Europe/Minsk'==model.timeZone}">selected</c:if>>(GMT+03:00) Further-eastern European Time (Europe/Minsk)</option>
-					<option value="Africa/Cairo"         <c:if test="${'Africa/Cairo'==model.timeZone}">selected</c:if>>(GMT+02:00) Eastern European Time (Africa/Cairo)</option>
-					<option value="Africa/Johannesburg"  <c:if test="${'Africa/Johannesburg'==model.timeZone}">selected</c:if>>(GMT+02:00) South Africa Standard Time (Africa/Johannesburg)</option>
-					<option value="Europe/Amsterdam"     <c:if test="${'Europe/Amsterdam'==model.timeZone}">selected</c:if>>(GMT+02:00) Central European Summer Time (Europe/Amsterdam)</option>
-					<option value="Europe/Berlin"        <c:if test="${'Europe/Berlin'==model.timeZone}">selected</c:if>>(GMT+02:00) Central European Summer Time (Europe/Berlin)</option>
-					<option value="Europe/Brussels"      <c:if test="${'Europe/Brussels'==model.timeZone}">selected</c:if>>(GMT+02:00) Central European Summer Time (Europe/Brussels)</option>
-					<option value="Europe/Paris"         <c:if test="${'Europe/Paris'==model.timeZone}">selected</c:if>>(GMT+02:00) Central European Summer Time (Europe/Paris)</option>
-					<option value="Europe/Prague"        <c:if test="${'Europe/Prague'==model.timeZone}">selected</c:if>>(GMT+02:00) Central European Summer Time (Europe/Prague)</option>
-					<option value="Europe/Rome"          <c:if test="${'Europe/Rome'==model.timeZone}">selected</c:if>>(GMT+02:00) Central European Summer Time (Europe/Rome)</option>
-					<option value="Africa/Algiers"       <c:if test="${'Africa/Algiers'==model.timeZone}">selected</c:if>>(GMT+01:00) Central European Time (Africa/Algiers)</option>
-					<option value="Europe/Dublin"        <c:if test="${'Europe/Dublin'==model.timeZone}">selected</c:if>>(GMT+01:00) Irish Summer Time (Europe/Dublin)</option>
-					<option value="Europe/Lisbon"        <c:if test="${'Europe/Lisbon'==model.timeZone}">selected</c:if>>(GMT+01:00) Western European Summer Time (Europe/Lisbon)</option>
-					<option value="Europe/London"        <c:if test="${'Europe/London'==model.timeZone}">selected</c:if>>(GMT+01:00) British Summer Time (Europe/London)</option>
-					<option value="Africa/Casablanca"    <c:if test="${'Africa/Casablanca'==model.timeZone}">selected</c:if>>(GMT+00:00) Western European Time (Africa/Casablanca)</option>
-					<option value="America/Scoresbysund" <c:if test="${'America/Scoresbysund'==model.timeZone}">selected</c:if>>(GMT+00:00) East Greenland Summer Time (America/Scoresbysund)</option>
-					<option value="Atlantic/Azores"      <c:if test="${'Atlantic/Azores'==model.timeZone}">selected</c:if>>(GMT+00:00) Azores Summer Time (Atlantic/Azores)</option>
-					<option value="GMT"                  <c:if test="${'GMT'==model.timeZone}">selected</c:if>>(GMT+00:00) Greenwich Mean Time (GMT)</option>
-					<option value="Atlantic/Cape_Verde"  <c:if test="${'Atlantic/Cape_Verde'==model.timeZone}">selected</c:if>>(GMT-01:00) Cape Verde Time (Atlantic/Cape_Verde)</option>
-					<option value="Atlantic/South_Georgia" <c:if test="${'Atlantic/South_Georgia'==model.timeZone}">selected</c:if>>(GMT-02:00) South Georgia Time (Atlantic/South_Georgia)</option>
-					<option value="America/St_Johns"      <c:if test="${'America/St_Johns'==model.timeZone}">selected</c:if>>(GMT-02:30) Newfoundland Daylight Time (America/St_Johns)</option>
-					<option value="America/Argentina/Buenos_Aires" <c:if test="${'America/Argentina/Buenos_Aires'==model.timeZone}">selected</c:if>>(GMT-03:00) Argentina Time (America/Argentina/Buenos_Aires)</option>
-					<option value="America/Halifax"      <c:if test="${'America/Halifax'==model.timeZone}">selected</c:if>>(GMT-03:00) Atlantic Daylight Time (America/Halifax)</option>
-					<option value="America/Santiago"     <c:if test="${'America/Santiago'==model.timeZone}">selected</c:if>>(GMT-03:00) Chile Summer Time (America/Santiago)</option>
-					<option value="America/Sao_Paulo"    <c:if test="${'America/Sao_Paulo'==model.timeZone}">selected</c:if>>(GMT-03:00) Brasilia Time (America/Sao_Paulo)</option>
-					<option value="Atlantic/Bermuda"     <c:if test="${'Atlantic/Bermuda'==model.timeZone}">selected</c:if>>(GMT-03:00) Atlantic Daylight Time (Atlantic/Bermuda)</option>
-					<option value="America/Indiana/Indianapolis" <c:if test="${'America/Indiana/Indianapolis'==model.timeZone}">selected</c:if>>(GMT-04:00) Eastern Daylight Time (America/Indiana/Indianapolis)</option>
-					<option value="America/New_York"     <c:if test="${'America/New_York'==model.timeZone}">selected</c:if>>(GMT-04:00) Eastern Daylight Time (America/New_York)</option>
-					<option value="America/Puerto_Rico"  <c:if test="${'America/Puerto_Rico'==model.timeZone}">selected</c:if>>(GMT-04:00) Atlantic Standard Time (America/Puerto_Rico)</option>
-					<option value="America/Caracas"      <c:if test="${'America/Caracas'==model.timeZone}">selected</c:if>>(GMT-04:30) Venezuela Time (America/Caracas)</option>
-					<option value="America/Bogota"       <c:if test="${'America/Bogota'==model.timeZone}">selected</c:if>>(GMT-05:00) Colombia Time (America/Bogota)</option>
-					<option value="America/Chicago"      <c:if test="${'America/Chicago'==model.timeZone}">selected</c:if>>(GMT-05:00) Central Daylight Time (America/Chicago)</option>
-					<option value="America/Lima"         <c:if test="${'America/Lima'==model.timeZone}">selected</c:if>>(GMT-05:00) Peru Time (America/Lima)</option>
-					<option value="America/Mexico_City"  <c:if test="${'America/Mexico_City'==model.timeZone}">selected</c:if>>(GMT-05:00) Central Daylight Time (America/Mexico_City)</option>
-					<option value="America/Panama"       <c:if test="${'America/Panama'==model.timeZone}">selected</c:if>>(GMT-05:00) Eastern Standard Time (America/Panama)</option>
-					<option value="America/Denver"       <c:if test="${'America/Denver'==model.timeZone}">selected</c:if>>(GMT-06:00) Mountain Daylight Time (America/Denver)</option>
-					<option value="America/El_Salvador"  <c:if test="${'America/El_Salvador'==model.timeZone}">selected</c:if>>(GMT-06:00) Central Standard Time (America/El_Salvador)</option>
-					<option value="America/Mazatlan"     <c:if test="${'America/Mazatlan'==model.timeZone}">selected</c:if>>(GMT-06:00) Mountain Daylight Time (America/Mazatlan)</option>
-					<option value="America/Los_Angeles"  <c:if test="${'America/Los_Angeles'==model.timeZone}">selected</c:if>>(GMT-07:00) Pacific Daylight Time (America/Los_Angeles)</option>
-					<option value="America/Phoenix"      <c:if test="${'America/Phoenix'==model.timeZone}">selected</c:if>>(GMT-07:00) Mountain Standard Time (America/Phoenix)</option>
-					<option value="America/Tijuana"      <c:if test="${'America/Tijuana'==model.timeZone}">selected</c:if>>(GMT-07:00) Pacific Daylight Time (America/Tijuana)</option>
-					<option value="America/Anchorage"    <c:if test="${'America/Anchorage'==model.timeZone}">selected</c:if>>(GMT-08:00) Alaska Daylight Time (America/Anchorage)</option>
-					<option value="Pacific/Pitcairn"     <c:if test="${'Pacific/Pitcairn'==model.timeZone}">selected</c:if>>(GMT-08:00) Pitcairn Time (Pacific/Pitcairn)</option>
-					<option value="America/Adak"         <c:if test="${'America/Adak'==model.timeZone}">selected</c:if>>(GMT-09:00) Hawaii-Aleutian Standard Time (America/Adak)</option>
-					<option value="Pacific/Gambier"      <c:if test="${'Pacific/Gambier'==model.timeZone}">selected</c:if>>(GMT-09:00) Gambier Time (Pacific/Gambier)</option>
-					<option value="Pacific/Marquesas"    <c:if test="${'Pacific/Marquesas'==model.timeZone}">selected</c:if>>(GMT-09:30) Marquesas Time (Pacific/Marquesas)</option>
-					<option value="Pacific/Honolulu"     <c:if test="${'Pacific/Honolulu'==model.timeZone}">selected</c:if>>(GMT-10:00) Hawaii-Aleutian Standard Time (Pacific/Honolulu)</option>
-					<option value="Pacific/Niue"         <c:if test="${'Pacific/Niue'==model.timeZone}">selected</c:if>>(GMT-11:00) Niue Time (Pacific/Niue)</option>
-					<option value="Pacific/Pago_Pago"    <c:if test="${'Pacific/Pago_Pago'==model.timeZone}">selected</c:if>>(GMT-11:00) Samoa Standard Time (Pacific/Pago_Pago)</option>
-					</select>
-
-			</td>
-			<th><s:Locale code="userinfo.locale" />:</th>
-			<td>
-				<select name="locale" id="locale">
-					<option value="" >Language</option>
-					<option value="en_US"  <c:if test="${'en_US'==model.locale}">selected</c:if>  >English</option>
-					<option value="nl_NL"  <c:if test="${'nl_NL'==model.locale}">selected</c:if>  >Dutch</option>
-					<option value="fr"     <c:if test="${'fr'==model.locale}">selected</c:if>  >French</option>
-					<option value="de"     <c:if test="${'de'==model.locale}">selected</c:if>  >German</option>
-					<option value="it"     <c:if test="${'it'==model.locale}">selected</c:if>  >Italian</option>
-					<option value="es"     <c:if test="${'es'==model.locale}">selected</c:if>  >Spanish</option>
-					<option value="sv"     <c:if test="${'sv'==model.locale}">selected</c:if>  >Swedish</option>
-					<option value="pt_BR"  <c:if test="${'pt_BR'==model.locale}">selected</c:if>  >Portuguese  (Brazilian)</option>
-					<option value="ja"     <c:if test="${'ja'==model.locale}">selected</c:if>  >Japanese</option>
-					<option value="zh_CN"  <c:if test="${'zh_CN'==model.locale}">selected</c:if>  >Chinese (Simplified)</option>
-					<option value="zh_TW"  <c:if test="${'zh_TW'==model.locale}">selected</c:if>  >Chinese (Traditional)</option>
-					<option value="ko"     <c:if test="${'ko'==model.locale}">selected</c:if>  >Korean</option>
-					<option value="th"     <c:if test="${'th'==model.locale}">selected</c:if>  >Thai</option>
-					<option value="fi"     <c:if test="${'fi'==model.locale}">selected</c:if>  >Finnish</option>
-					<option value="ru"     <c:if test="${'ru'==model.locale}">selected</c:if>  >Russian</option>
-				</select>
-			</td>
-		</tr>
-	</tbody>
-</table>

+ 0 - 415
maxkey-web-manage/src/main/resources/templates/views/userinfo/userUpdateCompany.jsp

@@ -1,415 +0,0 @@
-<%@ page   language="java"    import="java.util.*"   pageEncoding="UTF-8"%>
-<%@ taglib prefix="s"  uri="http://www.connsec.com/tags" %>
-<%@ taglib prefix="spring"	  uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="fmt"		  uri="http://java.sun.com/jsp/jstl/fmt"%>
-<%@ taglib prefix="c"		  uri="http://java.sun.com/jsp/jstl/core" %>
-<table  class="datatable"  style="display:none"  id="table_switch_company" width="980">
-	<tbody>
-		<tr>
-			<th style="width:15%;"><s:Locale code="userinfo.username" />:</th>
-			<td style="width:35%;">
-				<input readonly type="text"   title="" value="${model.username}"/>
-			</td>
-			<th style="width:15%;"><s:Locale code="userinfo.displayName" />:</th>
-			<td style="width:35%;">
-				<input readonly  type="text"  title="" value="${model.displayName}"/>
-			</td>
-		</tr>
-		<tr>
-			<td colspan="4">&nbsp;
-			</td>
-			
-		</tr>	
-		<tr>
-			<th><s:Locale code="userinfo.employeeNumber" />:</th>
-			<td>
-				<input readonly type="text" id="employeeNumber" name="employeeNumber"  title="" value="${model.employeeNumber}"/>
-				<b class="orange">*</b><label for="username"></label>
-			</td>
-			<th><s:Locale code="userinfo.windowsAccount" />:</th>
-			<td>
-				<input type="text" id="windowsAccount" name="windowsAccount"  title="" value="${model.windowsAccount}"/>
-				<label for="windowsAccount"></label>
-			</td>
-		</tr>
-		<tr>
-			<th><s:Locale code="userinfo.organization" />:</th>
-			<td>
-				<input type="text" id="organization" name="organization"  title="" value="${model.organization}"/>
-				<label for="organization"></label>
-			</td>
-			<th><s:Locale code="userinfo.division" />:</th>
-			<td>
-				<input type="text" id="division" name="division"  title="" value="${model.division}"/>
-				<label for="division"></label>
-			</td>
-			
-		</tr>
-		
-		<tr>
-			<th><s:Locale code="userinfo.department" />:</th>
-			<td>
-				<input type="hidden" id="departmentId" name="departmentId"  title="" value="${model.departmentId}"/>
-				<input type="text"  style="width:70%"  id="department" name="department"  title="" value="${model.department}"/>
-				<s:Dialog text="button.text.select" title="department" url="/orgs/orgsSelect/deptId/department" width="300" height="400" />
-				<label for="department"></label>
-			</td>
-			<th><s:Locale code="userinfo.costCenter" />:</th>
-			<td>
-				<input type="text" id="costCenter" name="costCenter"  title="" value="${model.costCenter}"/>
-				<label for="costCenter"></label>
-			</td>
-			
-		</tr>
-		<tr>
-			<th><s:Locale code="userinfo.jobTitle" />:</th>
-			<td>
-				<input type="text" id="jobTitle" name="jobTitle"  title="" value="${model.jobTitle}"/>
-				<label for="jobTitle"></label>
-			</td>
-			<th><s:Locale code="userinfo.jobLevel" />:</th>
-			<td>
-				<input type="text" id="jobLevel" name="jobLevel"  title="" value="${model.jobLevel}"/>
-				<label for="jobLevel"></label>
-			</td>
-		</tr>
-		<tr>
-			<th><s:Locale code="userinfo.manager" />:</th>
-			<td>
-				<input type="hidden" id="managerId" name="managerId"  title="" value="${model.managerId}"/>
-				<input type="text" id="manager" name="manager"  title="" value="${model.manager}"/>
-				<label for="manager"></label>
-			</td>
-			<th><s:Locale code="userinfo.assistant" />:</th>
-			<td>
-				<input type="hidden" id="assistantId" name="assistantId"  title="" value="${model.assistantId}"/>
-				<input  type="text" id="assistant" name="assistant"  title="" value="${model.assistant}"/>
-				<label for="delegatedApprover"></label>
-			</td>
-		</tr>
-		<tr>
-			<th><s:Locale code="userinfo.entryDate" />:</th>
-			<td>
-				<input type="text" id="entryDate" name="entryDate"  title="" value="${model.entryDate}"/>
-				<label for="entryDate"></label>
-			</td>
-			<th><s:Locale code="userinfo.quitDate" />:</th>
-			<td>
-				<input  type="text" id="quitDate" name="quitDate"  title="" value="${model.quitDate}"/>
-				<label for="delegatedApprover"></label>
-			</td>
-		</tr>
-		<tr>
-			<td colspan="4">&nbsp;
-			</td>
-			
-		</tr>
-		<tr>
-			<th><s:Locale code="userinfo.workCountry" />:</th>
-			<td>
-				<select  id="workCountry" name="workCountry">
-					<option value="AFG"  <c:if test="${'AFG'==model.workCountry}">selected</c:if>>Afghanistan</option>
-					<option value="ALA"  <c:if test="${'ALA'==model.workCountry}">selected</c:if>>Åland Islands</option>
-					<option value="ALB"  <c:if test="${'ALB'==model.workCountry}">selected</c:if>>Albania</option>
-					<option value="DZA"  <c:if test="${'DZA'==model.workCountry}">selected</c:if>>Algeria</option>
-					<option value="ASM"  <c:if test="${'ASM'==model.workCountry}">selected</c:if>>American Samoa</option>
-					<option value="AND"  <c:if test="${'AND'==model.workCountry}">selected</c:if>>Andorra</option>
-					<option value="AGO"  <c:if test="${'AGO'==model.workCountry}">selected</c:if>>Angola</option>
-					<option value="AIA"  <c:if test="${'AIA'==model.workCountry}">selected</c:if>>Anguilla</option>
-					<option value="ATA"  <c:if test="${'ATA'==model.workCountry}">selected</c:if>>Antarctica</option>
-					<option value="ATG"  <c:if test="${'ATG'==model.workCountry}">selected</c:if>>Antigua and Barbuda</option>
-					<option value="ARG"  <c:if test="${'ARG'==model.workCountry}">selected</c:if>>Argentina</option>
-					<option value="ARM"  <c:if test="${'ARM'==model.workCountry}">selected</c:if>>Armenia</option>
-					<option value="ABW"  <c:if test="${'ABW'==model.workCountry}">selected</c:if>>Aruba</option>
-					<option value="AUS"  <c:if test="${'AUS'==model.workCountry}">selected</c:if>>Australia</option>
-					<option value="AUT"  <c:if test="${'AUT'==model.workCountry}">selected</c:if>>Austria</option>
-					<option value="AZE"  <c:if test="${'AZE'==model.workCountry}">selected</c:if>>Azerbaijan</option>
-					<option value="BHS"  <c:if test="${'BHS'==model.workCountry}">selected</c:if>>Bahamas</option>
-					<option value="BHR"  <c:if test="${'BHR'==model.workCountry}">selected</c:if>>Bahrain</option>
-					<option value="BGD"  <c:if test="${'BGD'==model.workCountry}">selected</c:if>>Bangladesh</option>
-					<option value="BRB"  <c:if test="${'BRB'==model.workCountry}">selected</c:if>>Barbados</option>
-					<option value="BLR"  <c:if test="${'BLR'==model.workCountry}">selected</c:if>>Belarus</option>
-					<option value="BEL"  <c:if test="${'BEL'==model.workCountry}">selected</c:if>>Belgium</option>
-					<option value="BLZ"  <c:if test="${'BLZ'==model.workCountry}">selected</c:if>>Belize</option>
-					<option value="BEN"  <c:if test="${'BEN'==model.workCountry}">selected</c:if>>Benin</option>
-					<option value="BMU"  <c:if test="${'BMU'==model.workCountry}">selected</c:if>>Bermuda</option>
-					<option value="BTN"  <c:if test="${'BTN'==model.workCountry}">selected</c:if>>Bhutan</option>
-					<option value="BOL"  <c:if test="${'BOL'==model.workCountry}">selected</c:if>>Bolivia, Plurinational State of</option>
-					<option value="BES"  <c:if test="${'BES'==model.workCountry}">selected</c:if>>Bonaire, Sint Eustatius and Saba</option>
-					<option value="BIH"  <c:if test="${'BIH'==model.workCountry}">selected</c:if>>Bosnia and Herzegovina</option>
-					<option value="BWA"  <c:if test="${'BWA'==model.workCountry}">selected</c:if>>Botswana</option>
-					<option value="BVT"  <c:if test="${'BVT'==model.workCountry}">selected</c:if>>Bouvet Island</option>
-					<option value="BRA"  <c:if test="${'BRA'==model.workCountry}">selected</c:if>>Brazil</option>
-					<option value="IOT"  <c:if test="${'IOT'==model.workCountry}">selected</c:if>>British Indian Ocean Territory</option>
-					<option value="BRN"  <c:if test="${'BRN'==model.workCountry}">selected</c:if>>Brunei Darussalam</option>
-					<option value="BGR"  <c:if test="${'BGR'==model.workCountry}">selected</c:if>>Bulgaria</option>
-					<option value="BFA"  <c:if test="${'BFA'==model.workCountry}">selected</c:if>>Burkina Faso</option>
-					<option value="BDI"  <c:if test="${'BDI'==model.workCountry}">selected</c:if>>Burundi</option>
-					<option value="KHM"  <c:if test="${'KHM'==model.workCountry}">selected</c:if>>Cambodia</option>
-					<option value="CMR"  <c:if test="${'CMR'==model.workCountry}">selected</c:if>>Cameroon</option>
-					<option value="CAN"  <c:if test="${'CAN'==model.workCountry}">selected</c:if>>Canada</option>
-					<option value="CPV"  <c:if test="${'CPV'==model.workCountry}">selected</c:if>>Cape Verde</option>
-					<option value="CYM"  <c:if test="${'CYM'==model.workCountry}">selected</c:if>>Cayman Islands</option>
-					<option value="CAF"  <c:if test="${'CAF'==model.workCountry}">selected</c:if>>Central African Republic</option>
-					<option value="TCD"  <c:if test="${'TCD'==model.workCountry}">selected</c:if>>Chad</option>
-					<option value="CHL"  <c:if test="${'CHL'==model.workCountry}">selected</c:if>>Chile</option>
-					<option value="CHN"  <c:if test="${'CHN'==model.workCountry}">selected</c:if>>China</option>
-					<option value="CXR"  <c:if test="${'CXR'==model.workCountry}">selected</c:if>>Christmas Island</option>
-					<option value="CCK"  <c:if test="${'CCK'==model.workCountry}">selected</c:if>>Cocos (Keeling) Islands</option>
-					<option value="COL"  <c:if test="${'COL'==model.workCountry}">selected</c:if>>Colombia</option>
-					<option value="COM"  <c:if test="${'COM'==model.workCountry}">selected</c:if>>Comoros</option>
-					<option value="COG"  <c:if test="${'COG'==model.workCountry}">selected</c:if>>Congo</option>
-					<option value="COD"  <c:if test="${'COD'==model.workCountry}">selected</c:if>>Congo, the Democratic Republic of the</option>
-					<option value="COK"  <c:if test="${'COK'==model.workCountry}">selected</c:if>>Cook Islands</option>
-					<option value="CRI"  <c:if test="${'CRI'==model.workCountry}">selected</c:if>>Costa Rica</option>
-					<option value="CIV"  <c:if test="${'CIV'==model.workCountry}">selected</c:if>>Côte d'Ivoire</option>
-					<option value="HRV"  <c:if test="${'HRV'==model.workCountry}">selected</c:if>>Croatia</option>
-					<option value="CUB"  <c:if test="${'CUB'==model.workCountry}">selected</c:if>>Cuba</option>
-					<option value="CUW"  <c:if test="${'CUW'==model.workCountry}">selected</c:if>>Curaçao</option>
-					<option value="CYP"  <c:if test="${'CYP'==model.workCountry}">selected</c:if>>Cyprus</option>
-					<option value="CZE"  <c:if test="${'CZE'==model.workCountry}">selected</c:if>>Czech Republic</option>
-					<option value="DNK"  <c:if test="${'DNK'==model.workCountry}">selected</c:if>>Denmark</option>
-					<option value="DJI"  <c:if test="${'DJI'==model.workCountry}">selected</c:if>>Djibouti</option>
-					<option value="DMA"  <c:if test="${'DMA'==model.workCountry}">selected</c:if>>Dominica</option>
-					<option value="DOM"  <c:if test="${'DOM'==model.workCountry}">selected</c:if>>Dominican Republic</option>
-					<option value="ECU"  <c:if test="${'ECU'==model.workCountry}">selected</c:if>>Ecuador</option>
-					<option value="EGY"  <c:if test="${'EGY'==model.workCountry}">selected</c:if>>Egypt</option>
-					<option value="SLV"  <c:if test="${'SLV'==model.workCountry}">selected</c:if>>El Salvador</option>
-					<option value="GNQ"  <c:if test="${'GNQ'==model.workCountry}">selected</c:if>>Equatorial Guinea</option>
-					<option value="ERI"  <c:if test="${'ERI'==model.workCountry}">selected</c:if>>Eritrea</option>
-					<option value="EST"  <c:if test="${'EST'==model.workCountry}">selected</c:if>>Estonia</option>
-					<option value="ETH"  <c:if test="${'ETH'==model.workCountry}">selected</c:if>>Ethiopia</option>
-					<option value="FLK"  <c:if test="${'FLK'==model.workCountry}">selected</c:if>>Falkland Islands (Malvinas)</option>
-					<option value="FRO"  <c:if test="${'FRO'==model.workCountry}">selected</c:if>>Faroe Islands</option>
-					<option value="FJI"  <c:if test="${'FJI'==model.workCountry}">selected</c:if>>Fiji</option>
-					<option value="FIN"  <c:if test="${'FIN'==model.workCountry}">selected</c:if>>Finland</option>
-					<option value="FRA"  <c:if test="${'FRA'==model.workCountry}">selected</c:if>>France</option>
-					<option value="GUF"  <c:if test="${'GUF'==model.workCountry}">selected</c:if>>French Guiana</option>
-					<option value="PYF"  <c:if test="${'PYF'==model.workCountry}">selected</c:if>>French Polynesia</option>
-					<option value="ATF"  <c:if test="${'ATF'==model.workCountry}">selected</c:if>>French Southern Territories</option>
-					<option value="GAB"  <c:if test="${'GAB'==model.workCountry}">selected</c:if>>Gabon</option>
-					<option value="GMB"  <c:if test="${'GMB'==model.workCountry}">selected</c:if>>Gambia</option>
-					<option value="GEO"  <c:if test="${'GEO'==model.workCountry}">selected</c:if>>Georgia</option>
-					<option value="DEU"  <c:if test="${'DEU'==model.workCountry}">selected</c:if>>Germany</option>
-					<option value="GHA"  <c:if test="${'GHA'==model.workCountry}">selected</c:if>>Ghana</option>
-					<option value="GIB"  <c:if test="${'GIB'==model.workCountry}">selected</c:if>>Gibraltar</option>
-					<option value="GRC"  <c:if test="${'GRC'==model.workCountry}">selected</c:if>>Greece</option>
-					<option value="GRL"  <c:if test="${'GRL'==model.workCountry}">selected</c:if>>Greenland</option>
-					<option value="GRD"  <c:if test="${'GRD'==model.workCountry}">selected</c:if>>Grenada</option>
-					<option value="GLP"  <c:if test="${'GLP'==model.workCountry}">selected</c:if>>Guadeloupe</option>
-					<option value="GUM"  <c:if test="${'GUM'==model.workCountry}">selected</c:if>>Guam</option>
-					<option value="GTM"  <c:if test="${'GTM'==model.workCountry}">selected</c:if>>Guatemala</option>
-					<option value="GGY"  <c:if test="${'GGY'==model.workCountry}">selected</c:if>>Guernsey</option>
-					<option value="GIN"  <c:if test="${'GIN'==model.workCountry}">selected</c:if>>Guinea</option>
-					<option value="GNB"  <c:if test="${'GNB'==model.workCountry}">selected</c:if>>Guinea-Bissau</option>
-					<option value="GUY"  <c:if test="${'GUY'==model.workCountry}">selected</c:if>>Guyana</option>
-					<option value="HTI"  <c:if test="${'HTI'==model.workCountry}">selected</c:if>>Haiti</option>
-					<option value="HMD"  <c:if test="${'HMD'==model.workCountry}">selected</c:if>>Heard Island and McDonald Islands</option>
-					<option value="VAT"  <c:if test="${'VAT'==model.workCountry}">selected</c:if>>Holy See (Vatican City State)</option>
-					<option value="HND"  <c:if test="${'HND'==model.workCountry}">selected</c:if>>Honduras</option>
-					<option value="HKG"  <c:if test="${'HKG'==model.workCountry}">selected</c:if>>Hong Kong</option>
-					<option value="HUN"  <c:if test="${'HUN'==model.workCountry}">selected</c:if>>Hungary</option>
-					<option value="ISL"  <c:if test="${'ISL'==model.workCountry}">selected</c:if>>Iceland</option>
-					<option value="IND"  <c:if test="${'IND'==model.workCountry}">selected</c:if>>India</option>
-					<option value="IDN"  <c:if test="${'IDN'==model.workCountry}">selected</c:if>>Indonesia</option>
-					<option value="IRN"  <c:if test="${'IRN'==model.workCountry}">selected</c:if>>Iran, Islamic Republic of</option>
-					<option value="IRQ"  <c:if test="${'IRQ'==model.workCountry}">selected</c:if>>Iraq</option>
-					<option value="IRL"  <c:if test="${'IRL'==model.workCountry}">selected</c:if>>Ireland</option>
-					<option value="IMN"  <c:if test="${'IMN'==model.workCountry}">selected</c:if>>Isle of Man</option>
-					<option value="ISR"  <c:if test="${'ISR'==model.workCountry}">selected</c:if>>Israel</option>
-					<option value="ITA"  <c:if test="${'ITA'==model.workCountry}">selected</c:if>>Italy</option>
-					<option value="JAM"  <c:if test="${'JAM'==model.workCountry}">selected</c:if>>Jamaica</option>
-					<option value="JPN"  <c:if test="${'JPN'==model.workCountry}">selected</c:if>>Japan</option>
-					<option value="JEY"  <c:if test="${'JEY'==model.workCountry}">selected</c:if>>Jersey</option>
-					<option value="JOR"  <c:if test="${'JOR'==model.workCountry}">selected</c:if>>Jordan</option>
-					<option value="KAZ"  <c:if test="${'KAZ'==model.workCountry}">selected</c:if>>Kazakhstan</option>
-					<option value="KEN"  <c:if test="${'KEN'==model.workCountry}">selected</c:if>>Kenya</option>
-					<option value="KIR"  <c:if test="${'KIR'==model.workCountry}">selected</c:if>>Kiribati</option>
-					<option value="PRK"  <c:if test="${'PRK'==model.workCountry}">selected</c:if>>Korea, Democratic People's Republic of</option>
-					<option value="KOR"  <c:if test="${'KOR'==model.workCountry}">selected</c:if>>Korea, Republic of</option>
-					<option value="KWT"  <c:if test="${'KWT'==model.workCountry}">selected</c:if>>Kuwait</option>
-					<option value="KGZ"  <c:if test="${'KGZ'==model.workCountry}">selected</c:if>>Kyrgyzstan</option>
-					<option value="LAO"  <c:if test="${'LAO'==model.workCountry}">selected</c:if>>Lao People's Democratic Republic</option>
-					<option value="LVA"  <c:if test="${'LVA'==model.workCountry}">selected</c:if>>Latvia</option>
-					<option value="LBN"  <c:if test="${'LBN'==model.workCountry}">selected</c:if>>Lebanon</option>
-					<option value="LSO"  <c:if test="${'LSO'==model.workCountry}">selected</c:if>>Lesotho</option>
-					<option value="LBR"  <c:if test="${'LBR'==model.workCountry}">selected</c:if>>Liberia</option>
-					<option value="LBY"  <c:if test="${'LBY'==model.workCountry}">selected</c:if>>Libya</option>
-					<option value="LIE"  <c:if test="${'LIE'==model.workCountry}">selected</c:if>>Liechtenstein</option>
-					<option value="LTU"  <c:if test="${'LTU'==model.workCountry}">selected</c:if>>Lithuania</option>
-					<option value="LUX"  <c:if test="${'LUX'==model.workCountry}">selected</c:if>>Luxembourg</option>
-					<option value="MAC"  <c:if test="${'MAC'==model.workCountry}">selected</c:if>>Macao</option>
-					<option value="MKD"  <c:if test="${'MKD'==model.workCountry}">selected</c:if>>Macedonia, the former Yugoslav Republic of</option>
-					<option value="MDG"  <c:if test="${'MDG'==model.workCountry}">selected</c:if>>Madagascar</option>
-					<option value="MWI"  <c:if test="${'MWI'==model.workCountry}">selected</c:if>>Malawi</option>
-					<option value="MYS"  <c:if test="${'MYS'==model.workCountry}">selected</c:if>>Malaysia</option>
-					<option value="MDV"  <c:if test="${'MDV'==model.workCountry}">selected</c:if>>Maldives</option>
-					<option value="MLI"  <c:if test="${'MLI'==model.workCountry}">selected</c:if>>Mali</option>
-					<option value="MLT"  <c:if test="${'MLT'==model.workCountry}">selected</c:if>>Malta</option>
-					<option value="MHL"  <c:if test="${'MHL'==model.workCountry}">selected</c:if>>Marshall Islands</option>
-					<option value="MTQ"  <c:if test="${'MTQ'==model.workCountry}">selected</c:if>>Martinique</option>
-					<option value="MRT"  <c:if test="${'MRT'==model.workCountry}">selected</c:if>>Mauritania</option>
-					<option value="MUS"  <c:if test="${'MUS'==model.workCountry}">selected</c:if>>Mauritius</option>
-					<option value="MYT"  <c:if test="${'MYT'==model.workCountry}">selected</c:if>>Mayotte</option>
-					<option value="MEX"  <c:if test="${'MEX'==model.workCountry}">selected</c:if>>Mexico</option>
-					<option value="FSM"  <c:if test="${'FSM'==model.workCountry}">selected</c:if>>Micronesia, Federated States of</option>
-					<option value="MDA"  <c:if test="${'MDA'==model.workCountry}">selected</c:if>>Moldova, Republic of</option>
-					<option value="MCO"  <c:if test="${'MCO'==model.workCountry}">selected</c:if>>Monaco</option>
-					<option value="MNG"  <c:if test="${'MNG'==model.workCountry}">selected</c:if>>Mongolia</option>
-					<option value="MNE"  <c:if test="${'MNE'==model.workCountry}">selected</c:if>>Montenegro</option>
-					<option value="MSR"  <c:if test="${'MSR'==model.workCountry}">selected</c:if>>Montserrat</option>
-					<option value="MAR"  <c:if test="${'MAR'==model.workCountry}">selected</c:if>>Morocco</option>
-					<option value="MOZ"  <c:if test="${'MOZ'==model.workCountry}">selected</c:if>>Mozambique</option>
-					<option value="MMR"  <c:if test="${'MMR'==model.workCountry}">selected</c:if>>Myanmar</option>
-					<option value="NAM"  <c:if test="${'NAM'==model.workCountry}">selected</c:if>>Namibia</option>
-					<option value="NRU"  <c:if test="${'NRU'==model.workCountry}">selected</c:if>>Nauru</option>
-					<option value="NPL"  <c:if test="${'NPL'==model.workCountry}">selected</c:if>>Nepal</option>
-					<option value="NLD"  <c:if test="${'NLD'==model.workCountry}">selected</c:if>>Netherlands</option>
-					<option value="NCL"  <c:if test="${'NCL'==model.workCountry}">selected</c:if>>New Caledonia</option>
-					<option value="NZL"  <c:if test="${'NZL'==model.workCountry}">selected</c:if>>New Zealand</option>
-					<option value="NIC"  <c:if test="${'NIC'==model.workCountry}">selected</c:if>>Nicaragua</option>
-					<option value="NER"  <c:if test="${'NER'==model.workCountry}">selected</c:if>>Niger</option>
-					<option value="NGA"  <c:if test="${'NGA'==model.workCountry}">selected</c:if>>Nigeria</option>
-					<option value="NIU"  <c:if test="${'NIU'==model.workCountry}">selected</c:if>>Niue</option>
-					<option value="NFK"  <c:if test="${'NFK'==model.workCountry}">selected</c:if>>Norfolk Island</option>
-					<option value="MNP"  <c:if test="${'MNP'==model.workCountry}">selected</c:if>>Northern Mariana Islands</option>
-					<option value="NOR"  <c:if test="${'NOR'==model.workCountry}">selected</c:if>>Norway</option>
-					<option value="OMN"  <c:if test="${'OMN'==model.workCountry}">selected</c:if>>Oman</option>
-					<option value="PAK"  <c:if test="${'PAK'==model.workCountry}">selected</c:if>>Pakistan</option>
-					<option value="PLW"  <c:if test="${'PLW'==model.workCountry}">selected</c:if>>Palau</option>
-					<option value="PSE"  <c:if test="${'PSE'==model.workCountry}">selected</c:if>>Palestinian Territory, Occupied</option>
-					<option value="PAN"  <c:if test="${'PAN'==model.workCountry}">selected</c:if>>Panama</option>
-					<option value="PNG"  <c:if test="${'PNG'==model.workCountry}">selected</c:if>>Papua New Guinea</option>
-					<option value="PRY"  <c:if test="${'PRY'==model.workCountry}">selected</c:if>>Paraguay</option>
-					<option value="PER"  <c:if test="${'PER'==model.workCountry}">selected</c:if>>Peru</option>
-					<option value="PHL"  <c:if test="${'PHL'==model.workCountry}">selected</c:if>>Philippines</option>
-					<option value="PCN"  <c:if test="${'PCN'==model.workCountry}">selected</c:if>>Pitcairn</option>
-					<option value="POL"  <c:if test="${'POL'==model.workCountry}">selected</c:if>>Poland</option>
-					<option value="PRT"  <c:if test="${'PRT'==model.workCountry}">selected</c:if>>Portugal</option>
-					<option value="PRI"  <c:if test="${'PRI'==model.workCountry}">selected</c:if>>Puerto Rico</option>
-					<option value="QAT"  <c:if test="${'QAT'==model.workCountry}">selected</c:if>>Qatar</option>
-					<option value="REU"  <c:if test="${'REU'==model.workCountry}">selected</c:if>>Réunion</option>
-					<option value="ROU"  <c:if test="${'ROU'==model.workCountry}">selected</c:if>>Romania</option>
-					<option value="RUS"  <c:if test="${'RUS'==model.workCountry}">selected</c:if>>Russian Federation</option>
-					<option value="RWA"  <c:if test="${'RWA'==model.workCountry}">selected</c:if>>Rwanda</option>
-					<option value="BLM"  <c:if test="${'BLM'==model.workCountry}">selected</c:if>>Saint Barthélemy</option>
-					<option value="SHN"  <c:if test="${'SHN'==model.workCountry}">selected</c:if>>Saint Helena, Ascension and Tristan da Cunha</option>
-					<option value="KNA"  <c:if test="${'KNA'==model.workCountry}">selected</c:if>>Saint Kitts and Nevis</option>
-					<option value="LCA"  <c:if test="${'LCA'==model.workCountry}">selected</c:if>>Saint Lucia</option>
-					<option value="MAF"  <c:if test="${'MAF'==model.workCountry}">selected</c:if>>Saint Martin (French part)</option>
-					<option value="SPM"  <c:if test="${'SPM'==model.workCountry}">selected</c:if>>Saint Pierre and Miquelon</option>
-					<option value="VCT"  <c:if test="${'VCT'==model.workCountry}">selected</c:if>>Saint Vincent and the Grenadines</option>
-					<option value="WSM"  <c:if test="${'WSM'==model.workCountry}">selected</c:if>>Samoa</option>
-					<option value="SMR"  <c:if test="${'SMR'==model.workCountry}">selected</c:if>>San Marino</option>
-					<option value="STP"  <c:if test="${'STP'==model.workCountry}">selected</c:if>>Sao Tome and Principe</option>
-					<option value="SAU"  <c:if test="${'SAU'==model.workCountry}">selected</c:if>>Saudi Arabia</option>
-					<option value="SEN"  <c:if test="${'SEN'==model.workCountry}">selected</c:if>>Senegal</option>
-					<option value="SRB"  <c:if test="${'SRB'==model.workCountry}">selected</c:if>>Serbia</option>
-					<option value="SYC"  <c:if test="${'SYC'==model.workCountry}">selected</c:if>>Seychelles</option>
-					<option value="SLE"  <c:if test="${'SLE'==model.workCountry}">selected</c:if>>Sierra Leone</option>
-					<option value="SGP"  <c:if test="${'SGP'==model.workCountry}">selected</c:if>>Singapore</option>
-					<option value="SXM"  <c:if test="${'SXM'==model.workCountry}">selected</c:if>>Sint Maarten (Dutch part)</option>
-					<option value="SVK"  <c:if test="${'SVK'==model.workCountry}">selected</c:if>>Slovakia</option>
-					<option value="SVN"  <c:if test="${'SVN'==model.workCountry}">selected</c:if>>Slovenia</option>
-					<option value="SLB"  <c:if test="${'SLB'==model.workCountry}">selected</c:if>>Solomon Islands</option>
-					<option value="SOM"  <c:if test="${'SOM'==model.workCountry}">selected</c:if>>Somalia</option>
-					<option value="ZAF"  <c:if test="${'ZAF'==model.workCountry}">selected</c:if>>South Africa</option>
-					<option value="SGS"  <c:if test="${'SGS'==model.workCountry}">selected</c:if>>South Georgia and the South Sandwich Islands</option>
-					<option value="SSD"  <c:if test="${'SSD'==model.workCountry}">selected</c:if>>South Sudan</option>
-					<option value="ESP"  <c:if test="${'ESP'==model.workCountry}">selected</c:if>>Spain</option>
-					<option value="LKA"  <c:if test="${'LKA'==model.workCountry}">selected</c:if>>Sri Lanka</option>
-					<option value="SDN"  <c:if test="${'SDN'==model.workCountry}">selected</c:if>>Sudan</option>
-					<option value="SUR"  <c:if test="${'SUR'==model.workCountry}">selected</c:if>>Suriname</option>
-					<option value="SJM"  <c:if test="${'SJM'==model.workCountry}">selected</c:if>>Svalbard and Jan Mayen</option>
-					<option value="SWZ"  <c:if test="${'SWZ'==model.workCountry}">selected</c:if>>Swaziland</option>
-					<option value="SWE"  <c:if test="${'SWE'==model.workCountry}">selected</c:if>>Sweden</option>
-					<option value="CHE"  <c:if test="${'CHE'==model.workCountry}">selected</c:if>>Switzerland</option>
-					<option value="SYR"  <c:if test="${'SYR'==model.workCountry}">selected</c:if>>Syrian Arab Republic</option>
-					<option value="TWN"  <c:if test="${'TWN'==model.workCountry}">selected</c:if>>Taiwan, Province of China</option>
-					<option value="TJK"  <c:if test="${'TJK'==model.workCountry}">selected</c:if>>Tajikistan</option>
-					<option value="TZA"  <c:if test="${'TZA'==model.workCountry}">selected</c:if>>Tanzania, United Republic of</option>
-					<option value="THA"  <c:if test="${'THA'==model.workCountry}">selected</c:if>>Thailand</option>
-					<option value="TLS"  <c:if test="${'TLS'==model.workCountry}">selected</c:if>>Timor-Leste</option>
-					<option value="TGO"  <c:if test="${'TGO'==model.workCountry}">selected</c:if>>Togo</option>
-					<option value="TKL"  <c:if test="${'TKL'==model.workCountry}">selected</c:if>>Tokelau</option>
-					<option value="TON"  <c:if test="${'TON'==model.workCountry}">selected</c:if>>Tonga</option>
-					<option value="TTO"  <c:if test="${'TTO'==model.workCountry}">selected</c:if>>Trinidad and Tobago</option>
-					<option value="TUN"  <c:if test="${'TUN'==model.workCountry}">selected</c:if>>Tunisia</option>
-					<option value="TUR"  <c:if test="${'TUR'==model.workCountry}">selected</c:if>>Turkey</option>
-					<option value="TKM"  <c:if test="${'TKM'==model.workCountry}">selected</c:if>>Turkmenistan</option>
-					<option value="TCA"  <c:if test="${'TCA'==model.workCountry}">selected</c:if>>Turks and Caicos Islands</option>
-					<option value="TUV"  <c:if test="${'TUV'==model.workCountry}">selected</c:if>>Tuvalu</option>
-					<option value="UGA"  <c:if test="${'UGA'==model.workCountry}">selected</c:if>>Uganda</option>
-					<option value="UKR"  <c:if test="${'UKR'==model.workCountry}">selected</c:if>>Ukraine</option>
-					<option value="ARE"  <c:if test="${'ARE'==model.workCountry}">selected</c:if>>United Arab Emirates</option>
-					<option value="GBR"  <c:if test="${'GBR'==model.workCountry}">selected</c:if>>United Kingdom</option>
-					<option value="USA"  <c:if test="${'USA'==model.workCountry}">selected</c:if>>United States</option>
-					<option value="UMI"  <c:if test="${'UMI'==model.workCountry}">selected</c:if>>United States Minor Outlying Islands</option>
-					<option value="URY"  <c:if test="${'URY'==model.workCountry}">selected</c:if>>Uruguay</option>
-					<option value="UZB"  <c:if test="${'UZB'==model.workCountry}">selected</c:if>>Uzbekistan</option>
-					<option value="VUT"  <c:if test="${'VUT'==model.workCountry}">selected</c:if>>Vanuatu</option>
-					<option value="VEN"  <c:if test="${'VEN'==model.workCountry}">selected</c:if>>Venezuela, Bolivarian Republic of</option>
-					<option value="VNM"  <c:if test="${'VNM'==model.workCountry}">selected</c:if>>Viet Nam</option>
-					<option value="VGB"  <c:if test="${'VGB'==model.workCountry}">selected</c:if>>Virgin Islands, British</option>
-					<option value="VIR"  <c:if test="${'VIR'==model.workCountry}">selected</c:if>>Virgin Islands, U.S.</option>
-					<option value="WLF"  <c:if test="${'WLF'==model.workCountry}">selected</c:if>>Wallis and Futuna</option>
-					<option value="ESH"  <c:if test="${'ESH'==model.workCountry}">selected</c:if>>Western Sahara</option>
-					<option value="YEM"  <c:if test="${'YEM'==model.workCountry}">selected</c:if>>Yemen</option>
-					<option value="ZMB"  <c:if test="${'ZMB'==model.workCountry}">selected</c:if>>Zambia</option>
-					<option value="ZWE"  <c:if test="${'ZWE'==model.workCountry}">selected</c:if>>Zimbabwe</option>
-				</select>
-				<label for="workCountry"></label>
-			</td>
-			<th><s:Locale code="userinfo.workRegion" />:</th>
-			<td>
-				<input type="text" id="workRegion" name="workRegion"  title="" value="${model.workRegion}"/>
-				<label for="province"></label>
-			</td>
-		</tr>
-		<tr>
-			
-			<th><s:Locale code="userinfo.workLocality" />:</th>
-			<td>
-				<input type="text" id="workLocality" name="workLocality"  title="" value="${model.workLocality}"/>
-				<label for="workLocality"></label>
-			</td>
-			<th><s:Locale code="userinfo.workStreetAddress" />:</th>
-			<td>
-				<input type="text" id="workStreetAddress" name="workStreetAddress"  title="" value="${model.workStreetAddress}"/>
-				<label for="street"></label>
-			</td>
-		</tr>
-		<tr>
-			
-			<th><s:Locale code="userinfo.workPostalCode" />:</th>
-			<td>
-				<input type="text" id="workPostalCode" name="workPostalCode"  title="" value="${model.workPostalCode}"/>
-				<label for="workPostalCode"></label>
-			</td>
-			<th><s:Locale code="userinfo.workFax" />:</th>
-			<td>
-				<input type="text" id="workFax" name="workFax"  title="" value="${model.workFax}"/>
-				<label for="workFax"></label>
-			</td>
-		</tr>
-
-		<tr>
-			<th><s:Locale code="userinfo.workPhoneNumber" />:</th>
-			<td>
-				<input type="text" id="workPhoneNumber" name="workPhoneNumber"  title="" value="${model.workPhoneNumber}"/>
-				<label for="workPhoneNumber"></label>
-			</td>
-			<th><s:Locale code="userinfo.workEmail" />:</th>
-			<td>
-				<input type="text" id="workEmail" name="workEmail"  title="" value="${model.workEmail}"/>
-				<label for="workEmail"></label>
-			</td>
-			
-		</tr>
-		<tr>
-			<td colspan="4">&nbsp;
-			</td>
-			
-		</tr>
-	</tbody>
-</table>

+ 0 - 444
maxkey-web-manage/src/main/resources/templates/views/userinfo/userUpdateHome.jsp

@@ -1,444 +0,0 @@
-<%@ page   language="java"    import="java.util.*"   pageEncoding="UTF-8"%>
-<%@ page   import="org.maxkey.web.*"%>
-<%@ taglib prefix="s"  uri="http://www.connsec.com/tags" %>
-<%@ taglib prefix="spring"	  uri="http://www.springframework.org/tags" %>
-<%@ taglib prefix="fmt"		  uri="http://java.sun.com/jsp/jstl/fmt"%>
-<%@ taglib prefix="c"		  uri="http://java.sun.com/jsp/jstl/core" %>
-<table  class="datatable"  style="display:none"  id="table_switch_home" width="980">
-	<tbody>	
-		<tr>
-			<th style="width:15%;"><s:Locale code="userinfo.username" />:</th>
-			<td style="width:35%;">
-				<input readonly type="text"   title="" value="${model.username}"/>
-			</td>
-			<th style="width:15%;"><s:Locale code="userinfo.displayName" />:</th>
-			<td style="width:35%;">
-				<input readonly type="text"  title="" value="${model.displayName}"/>
-			</td>
-		</tr>
-		<tr>
-			<td colspan="4">&nbsp;
-			</td>
-			
-		</tr>
-		<tr>
-			<th><s:Locale code="userinfo.idType" />:</th>
-			<td>
-				<select name="idType"  class="select_t">
-					<option value="0"  <c:if test="${0==model.idType}">selected</c:if> ><s:Locale code="userinfo.usertype.UNKNOWN" /></option>
-					<option value="1"  <c:if test="${1==model.idType}">selected</c:if> ><s:Locale code="userinfo.usertype.IDCARD" /></option>
-					<option value="2"  <c:if test="${2==model.idType}">selected</c:if> ><s:Locale code="userinfo.usertype.PASSPORT" /></option>
-					<option value="3"  <c:if test="${3==model.idType}">selected</c:if> ><s:Locale code="userinfo.usertype.STUDENTCARD" /></option>
-					<option value="4"  <c:if test="${4==model.idType}">selected</c:if> ><s:Locale code="userinfo.usertype.MILITARYCARD" /></option>
-				</select>
-			</td>
-			
-			<th><s:Locale code="userinfo.idCardNo" />:</th>
-			<td>
-				<input type="text" id="idCardNo" name="idCardNo"  title="" value="${model.idCardNo}"/>
-				<label for="idCardNo"></label>
-			</td>
-		</tr>
-		<tr>
-			
-			<th><s:Locale code="userinfo.married" />:</th>
-			<td>
-				<select name="married"  class="select_t">
-					<option value="0"  <c:if test="${0==model.married}">selected</c:if> ><s:Locale code="userinfo.usertype.UNKNOWN" /></option>
-					<option value="1"  <c:if test="${1==model.married}">selected</c:if> ><s:Locale code="userinfo.usertype.SINGLE" /></option>
-					<option value="2"  <c:if test="${2==model.married}">selected</c:if> ><s:Locale code="userinfo.usertype.MARRIED" /></option>
-					<option value="3"  <c:if test="${3==model.married}">selected</c:if> ><s:Locale code="userinfo.usertype.DIVORCE" /></option>
-					<option value="4"  <c:if test="${4==model.married}">selected</c:if> ><s:Locale code="userinfo.usertype.WIDOWED" /></option>
-				</select>
-			</td>
-			<th><s:Locale code="userinfo.startWorkDate" />:</th>
-			<td>
-				<input type="text" id="startWorkDate" name="startWorkDate"  title="" value="${model.startWorkDate}"/>
-				<label for="startWorkDate"></label>
-			</td>
-		</tr>
-		<tr>
-			<td colspan="4">&nbsp;
-			</td>
-			
-		</tr>
-		<tr>
-			<th><s:Locale code="userinfo.homeCountry" />:</th>
-			<td>
-				<select  id="homeCountry" name="homeCountry">
-					<option value="AFG"  <c:if test="${'AFG'==model.homeCountry}">selected</c:if>>Afghanistan</option>
-					<option value="ALA"  <c:if test="${'ALA'==model.homeCountry}">selected</c:if>>Åland Islands</option>
-					<option value="ALB"  <c:if test="${'ALB'==model.homeCountry}">selected</c:if>>Albania</option>
-					<option value="DZA"  <c:if test="${'DZA'==model.homeCountry}">selected</c:if>>Algeria</option>
-					<option value="ASM"  <c:if test="${'ASM'==model.homeCountry}">selected</c:if>>American Samoa</option>
-					<option value="AND"  <c:if test="${'AND'==model.homeCountry}">selected</c:if>>Andorra</option>
-					<option value="AGO"  <c:if test="${'AGO'==model.homeCountry}">selected</c:if>>Angola</option>
-					<option value="AIA"  <c:if test="${'AIA'==model.homeCountry}">selected</c:if>>Anguilla</option>
-					<option value="ATA"  <c:if test="${'ATA'==model.homeCountry}">selected</c:if>>Antarctica</option>
-					<option value="ATG"  <c:if test="${'ATG'==model.homeCountry}">selected</c:if>>Antigua and Barbuda</option>
-					<option value="ARG"  <c:if test="${'ARG'==model.homeCountry}">selected</c:if>>Argentina</option>
-					<option value="ARM"  <c:if test="${'ARM'==model.homeCountry}">selected</c:if>>Armenia</option>
-					<option value="ABW"  <c:if test="${'ABW'==model.homeCountry}">selected</c:if>>Aruba</option>
-					<option value="AUS"  <c:if test="${'AUS'==model.homeCountry}">selected</c:if>>Australia</option>
-					<option value="AUT"  <c:if test="${'AUT'==model.homeCountry}">selected</c:if>>Austria</option>
-					<option value="AZE"  <c:if test="${'AZE'==model.homeCountry}">selected</c:if>>Azerbaijan</option>
-					<option value="BHS"  <c:if test="${'BHS'==model.homeCountry}">selected</c:if>>Bahamas</option>
-					<option value="BHR"  <c:if test="${'BHR'==model.homeCountry}">selected</c:if>>Bahrain</option>
-					<option value="BGD"  <c:if test="${'BGD'==model.homeCountry}">selected</c:if>>Bangladesh</option>
-					<option value="BRB"  <c:if test="${'BRB'==model.homeCountry}">selected</c:if>>Barbados</option>
-					<option value="BLR"  <c:if test="${'BLR'==model.homeCountry}">selected</c:if>>Belarus</option>
-					<option value="BEL"  <c:if test="${'BEL'==model.homeCountry}">selected</c:if>>Belgium</option>
-					<option value="BLZ"  <c:if test="${'BLZ'==model.homeCountry}">selected</c:if>>Belize</option>
-					<option value="BEN"  <c:if test="${'BEN'==model.homeCountry}">selected</c:if>>Benin</option>
-					<option value="BMU"  <c:if test="${'BMU'==model.homeCountry}">selected</c:if>>Bermuda</option>
-					<option value="BTN"  <c:if test="${'BTN'==model.homeCountry}">selected</c:if>>Bhutan</option>
-					<option value="BOL"  <c:if test="${'BOL'==model.homeCountry}">selected</c:if>>Bolivia, Plurinational State of</option>
-					<option value="BES"  <c:if test="${'BES'==model.homeCountry}">selected</c:if>>Bonaire, Sint Eustatius and Saba</option>
-					<option value="BIH"  <c:if test="${'BIH'==model.homeCountry}">selected</c:if>>Bosnia and Herzegovina</option>
-					<option value="BWA"  <c:if test="${'BWA'==model.homeCountry}">selected</c:if>>Botswana</option>
-					<option value="BVT"  <c:if test="${'BVT'==model.homeCountry}">selected</c:if>>Bouvet Island</option>
-					<option value="BRA"  <c:if test="${'BRA'==model.homeCountry}">selected</c:if>>Brazil</option>
-					<option value="IOT"  <c:if test="${'IOT'==model.homeCountry}">selected</c:if>>British Indian Ocean Territory</option>
-					<option value="BRN"  <c:if test="${'BRN'==model.homeCountry}">selected</c:if>>Brunei Darussalam</option>
-					<option value="BGR"  <c:if test="${'BGR'==model.homeCountry}">selected</c:if>>Bulgaria</option>
-					<option value="BFA"  <c:if test="${'BFA'==model.homeCountry}">selected</c:if>>Burkina Faso</option>
-					<option value="BDI"  <c:if test="${'BDI'==model.homeCountry}">selected</c:if>>Burundi</option>
-					<option value="KHM"  <c:if test="${'KHM'==model.homeCountry}">selected</c:if>>Cambodia</option>
-					<option value="CMR"  <c:if test="${'CMR'==model.homeCountry}">selected</c:if>>Cameroon</option>
-					<option value="CAN"  <c:if test="${'CAN'==model.homeCountry}">selected</c:if>>Canada</option>
-					<option value="CPV"  <c:if test="${'CPV'==model.homeCountry}">selected</c:if>>Cape Verde</option>
-					<option value="CYM"  <c:if test="${'CYM'==model.homeCountry}">selected</c:if>>Cayman Islands</option>
-					<option value="CAF"  <c:if test="${'CAF'==model.homeCountry}">selected</c:if>>Central African Republic</option>
-					<option value="TCD"  <c:if test="${'TCD'==model.homeCountry}">selected</c:if>>Chad</option>
-					<option value="CHL"  <c:if test="${'CHL'==model.homeCountry}">selected</c:if>>Chile</option>
-					<option value="CHN"  <c:if test="${'CHN'==model.homeCountry}">selected</c:if>>China</option>
-					<option value="CXR"  <c:if test="${'CXR'==model.homeCountry}">selected</c:if>>Christmas Island</option>
-					<option value="CCK"  <c:if test="${'CCK'==model.homeCountry}">selected</c:if>>Cocos (Keeling) Islands</option>
-					<option value="COL"  <c:if test="${'COL'==model.homeCountry}">selected</c:if>>Colombia</option>
-					<option value="COM"  <c:if test="${'COM'==model.homeCountry}">selected</c:if>>Comoros</option>
-					<option value="COG"  <c:if test="${'COG'==model.homeCountry}">selected</c:if>>Congo</option>
-					<option value="COD"  <c:if test="${'COD'==model.homeCountry}">selected</c:if>>Congo, the Democratic Republic of the</option>
-					<option value="COK"  <c:if test="${'COK'==model.homeCountry}">selected</c:if>>Cook Islands</option>
-					<option value="CRI"  <c:if test="${'CRI'==model.homeCountry}">selected</c:if>>Costa Rica</option>
-					<option value="CIV"  <c:if test="${'CIV'==model.homeCountry}">selected</c:if>>Côte d'Ivoire</option>
-					<option value="HRV"  <c:if test="${'HRV'==model.homeCountry}">selected</c:if>>Croatia</option>
-					<option value="CUB"  <c:if test="${'CUB'==model.homeCountry}">selected</c:if>>Cuba</option>
-					<option value="CUW"  <c:if test="${'CUW'==model.homeCountry}">selected</c:if>>Curaçao</option>
-					<option value="CYP"  <c:if test="${'CYP'==model.homeCountry}">selected</c:if>>Cyprus</option>
-					<option value="CZE"  <c:if test="${'CZE'==model.homeCountry}">selected</c:if>>Czech Republic</option>
-					<option value="DNK"  <c:if test="${'DNK'==model.homeCountry}">selected</c:if>>Denmark</option>
-					<option value="DJI"  <c:if test="${'DJI'==model.homeCountry}">selected</c:if>>Djibouti</option>
-					<option value="DMA"  <c:if test="${'DMA'==model.homeCountry}">selected</c:if>>Dominica</option>
-					<option value="DOM"  <c:if test="${'DOM'==model.homeCountry}">selected</c:if>>Dominican Republic</option>
-					<option value="ECU"  <c:if test="${'ECU'==model.homeCountry}">selected</c:if>>Ecuador</option>
-					<option value="EGY"  <c:if test="${'EGY'==model.homeCountry}">selected</c:if>>Egypt</option>
-					<option value="SLV"  <c:if test="${'SLV'==model.homeCountry}">selected</c:if>>El Salvador</option>
-					<option value="GNQ"  <c:if test="${'GNQ'==model.homeCountry}">selected</c:if>>Equatorial Guinea</option>
-					<option value="ERI"  <c:if test="${'ERI'==model.homeCountry}">selected</c:if>>Eritrea</option>
-					<option value="EST"  <c:if test="${'EST'==model.homeCountry}">selected</c:if>>Estonia</option>
-					<option value="ETH"  <c:if test="${'ETH'==model.homeCountry}">selected</c:if>>Ethiopia</option>
-					<option value="FLK"  <c:if test="${'FLK'==model.homeCountry}">selected</c:if>>Falkland Islands (Malvinas)</option>
-					<option value="FRO"  <c:if test="${'FRO'==model.homeCountry}">selected</c:if>>Faroe Islands</option>
-					<option value="FJI"  <c:if test="${'FJI'==model.homeCountry}">selected</c:if>>Fiji</option>
-					<option value="FIN"  <c:if test="${'FIN'==model.homeCountry}">selected</c:if>>Finland</option>
-					<option value="FRA"  <c:if test="${'FRA'==model.homeCountry}">selected</c:if>>France</option>
-					<option value="GUF"  <c:if test="${'GUF'==model.homeCountry}">selected</c:if>>French Guiana</option>
-					<option value="PYF"  <c:if test="${'PYF'==model.homeCountry}">selected</c:if>>French Polynesia</option>
-					<option value="ATF"  <c:if test="${'ATF'==model.homeCountry}">selected</c:if>>French Southern Territories</option>
-					<option value="GAB"  <c:if test="${'GAB'==model.homeCountry}">selected</c:if>>Gabon</option>
-					<option value="GMB"  <c:if test="${'GMB'==model.homeCountry}">selected</c:if>>Gambia</option>
-					<option value="GEO"  <c:if test="${'GEO'==model.homeCountry}">selected</c:if>>Georgia</option>
-					<option value="DEU"  <c:if test="${'DEU'==model.homeCountry}">selected</c:if>>Germany</option>
-					<option value="GHA"  <c:if test="${'GHA'==model.homeCountry}">selected</c:if>>Ghana</option>
-					<option value="GIB"  <c:if test="${'GIB'==model.homeCountry}">selected</c:if>>Gibraltar</option>
-					<option value="GRC"  <c:if test="${'GRC'==model.homeCountry}">selected</c:if>>Greece</option>
-					<option value="GRL"  <c:if test="${'GRL'==model.homeCountry}">selected</c:if>>Greenland</option>
-					<option value="GRD"  <c:if test="${'GRD'==model.homeCountry}">selected</c:if>>Grenada</option>
-					<option value="GLP"  <c:if test="${'GLP'==model.homeCountry}">selected</c:if>>Guadeloupe</option>
-					<option value="GUM"  <c:if test="${'GUM'==model.homeCountry}">selected</c:if>>Guam</option>
-					<option value="GTM"  <c:if test="${'GTM'==model.homeCountry}">selected</c:if>>Guatemala</option>
-					<option value="GGY"  <c:if test="${'GGY'==model.homeCountry}">selected</c:if>>Guernsey</option>
-					<option value="GIN"  <c:if test="${'GIN'==model.homeCountry}">selected</c:if>>Guinea</option>
-					<option value="GNB"  <c:if test="${'GNB'==model.homeCountry}">selected</c:if>>Guinea-Bissau</option>
-					<option value="GUY"  <c:if test="${'GUY'==model.homeCountry}">selected</c:if>>Guyana</option>
-					<option value="HTI"  <c:if test="${'HTI'==model.homeCountry}">selected</c:if>>Haiti</option>
-					<option value="HMD"  <c:if test="${'HMD'==model.homeCountry}">selected</c:if>>Heard Island and McDonald Islands</option>
-					<option value="VAT"  <c:if test="${'VAT'==model.homeCountry}">selected</c:if>>Holy See (Vatican City State)</option>
-					<option value="HND"  <c:if test="${'HND'==model.homeCountry}">selected</c:if>>Honduras</option>
-					<option value="HKG"  <c:if test="${'HKG'==model.homeCountry}">selected</c:if>>Hong Kong</option>
-					<option value="HUN"  <c:if test="${'HUN'==model.homeCountry}">selected</c:if>>Hungary</option>
-					<option value="ISL"  <c:if test="${'ISL'==model.homeCountry}">selected</c:if>>Iceland</option>
-					<option value="IND"  <c:if test="${'IND'==model.homeCountry}">selected</c:if>>India</option>
-					<option value="IDN"  <c:if test="${'IDN'==model.homeCountry}">selected</c:if>>Indonesia</option>
-					<option value="IRN"  <c:if test="${'IRN'==model.homeCountry}">selected</c:if>>Iran, Islamic Republic of</option>
-					<option value="IRQ"  <c:if test="${'IRQ'==model.homeCountry}">selected</c:if>>Iraq</option>
-					<option value="IRL"  <c:if test="${'IRL'==model.homeCountry}">selected</c:if>>Ireland</option>
-					<option value="IMN"  <c:if test="${'IMN'==model.homeCountry}">selected</c:if>>Isle of Man</option>
-					<option value="ISR"  <c:if test="${'ISR'==model.homeCountry}">selected</c:if>>Israel</option>
-					<option value="ITA"  <c:if test="${'ITA'==model.homeCountry}">selected</c:if>>Italy</option>
-					<option value="JAM"  <c:if test="${'JAM'==model.homeCountry}">selected</c:if>>Jamaica</option>
-					<option value="JPN"  <c:if test="${'JPN'==model.homeCountry}">selected</c:if>>Japan</option>
-					<option value="JEY"  <c:if test="${'JEY'==model.homeCountry}">selected</c:if>>Jersey</option>
-					<option value="JOR"  <c:if test="${'JOR'==model.homeCountry}">selected</c:if>>Jordan</option>
-					<option value="KAZ"  <c:if test="${'KAZ'==model.homeCountry}">selected</c:if>>Kazakhstan</option>
-					<option value="KEN"  <c:if test="${'KEN'==model.homeCountry}">selected</c:if>>Kenya</option>
-					<option value="KIR"  <c:if test="${'KIR'==model.homeCountry}">selected</c:if>>Kiribati</option>
-					<option value="PRK"  <c:if test="${'PRK'==model.homeCountry}">selected</c:if>>Korea, Democratic People's Republic of</option>
-					<option value="KOR"  <c:if test="${'KOR'==model.homeCountry}">selected</c:if>>Korea, Republic of</option>
-					<option value="KWT"  <c:if test="${'KWT'==model.homeCountry}">selected</c:if>>Kuwait</option>
-					<option value="KGZ"  <c:if test="${'KGZ'==model.homeCountry}">selected</c:if>>Kyrgyzstan</option>
-					<option value="LAO"  <c:if test="${'LAO'==model.homeCountry}">selected</c:if>>Lao People's Democratic Republic</option>
-					<option value="LVA"  <c:if test="${'LVA'==model.homeCountry}">selected</c:if>>Latvia</option>
-					<option value="LBN"  <c:if test="${'LBN'==model.homeCountry}">selected</c:if>>Lebanon</option>
-					<option value="LSO"  <c:if test="${'LSO'==model.homeCountry}">selected</c:if>>Lesotho</option>
-					<option value="LBR"  <c:if test="${'LBR'==model.homeCountry}">selected</c:if>>Liberia</option>
-					<option value="LBY"  <c:if test="${'LBY'==model.homeCountry}">selected</c:if>>Libya</option>
-					<option value="LIE"  <c:if test="${'LIE'==model.homeCountry}">selected</c:if>>Liechtenstein</option>
-					<option value="LTU"  <c:if test="${'LTU'==model.homeCountry}">selected</c:if>>Lithuania</option>
-					<option value="LUX"  <c:if test="${'LUX'==model.homeCountry}">selected</c:if>>Luxembourg</option>
-					<option value="MAC"  <c:if test="${'MAC'==model.homeCountry}">selected</c:if>>Macao</option>
-					<option value="MKD"  <c:if test="${'MKD'==model.homeCountry}">selected</c:if>>Macedonia, the former Yugoslav Republic of</option>
-					<option value="MDG"  <c:if test="${'MDG'==model.homeCountry}">selected</c:if>>Madagascar</option>
-					<option value="MWI"  <c:if test="${'MWI'==model.homeCountry}">selected</c:if>>Malawi</option>
-					<option value="MYS"  <c:if test="${'MYS'==model.homeCountry}">selected</c:if>>Malaysia</option>
-					<option value="MDV"  <c:if test="${'MDV'==model.homeCountry}">selected</c:if>>Maldives</option>
-					<option value="MLI"  <c:if test="${'MLI'==model.homeCountry}">selected</c:if>>Mali</option>
-					<option value="MLT"  <c:if test="${'MLT'==model.homeCountry}">selected</c:if>>Malta</option>
-					<option value="MHL"  <c:if test="${'MHL'==model.homeCountry}">selected</c:if>>Marshall Islands</option>
-					<option value="MTQ"  <c:if test="${'MTQ'==model.homeCountry}">selected</c:if>>Martinique</option>
-					<option value="MRT"  <c:if test="${'MRT'==model.homeCountry}">selected</c:if>>Mauritania</option>
-					<option value="MUS"  <c:if test="${'MUS'==model.homeCountry}">selected</c:if>>Mauritius</option>
-					<option value="MYT"  <c:if test="${'MYT'==model.homeCountry}">selected</c:if>>Mayotte</option>
-					<option value="MEX"  <c:if test="${'MEX'==model.homeCountry}">selected</c:if>>Mexico</option>
-					<option value="FSM"  <c:if test="${'FSM'==model.homeCountry}">selected</c:if>>Micronesia, Federated States of</option>
-					<option value="MDA"  <c:if test="${'MDA'==model.homeCountry}">selected</c:if>>Moldova, Republic of</option>
-					<option value="MCO"  <c:if test="${'MCO'==model.homeCountry}">selected</c:if>>Monaco</option>
-					<option value="MNG"  <c:if test="${'MNG'==model.homeCountry}">selected</c:if>>Mongolia</option>
-					<option value="MNE"  <c:if test="${'MNE'==model.homeCountry}">selected</c:if>>Montenegro</option>
-					<option value="MSR"  <c:if test="${'MSR'==model.homeCountry}">selected</c:if>>Montserrat</option>
-					<option value="MAR"  <c:if test="${'MAR'==model.homeCountry}">selected</c:if>>Morocco</option>
-					<option value="MOZ"  <c:if test="${'MOZ'==model.homeCountry}">selected</c:if>>Mozambique</option>
-					<option value="MMR"  <c:if test="${'MMR'==model.homeCountry}">selected</c:if>>Myanmar</option>
-					<option value="NAM"  <c:if test="${'NAM'==model.homeCountry}">selected</c:if>>Namibia</option>
-					<option value="NRU"  <c:if test="${'NRU'==model.homeCountry}">selected</c:if>>Nauru</option>
-					<option value="NPL"  <c:if test="${'NPL'==model.homeCountry}">selected</c:if>>Nepal</option>
-					<option value="NLD"  <c:if test="${'NLD'==model.homeCountry}">selected</c:if>>Netherlands</option>
-					<option value="NCL"  <c:if test="${'NCL'==model.homeCountry}">selected</c:if>>New Caledonia</option>
-					<option value="NZL"  <c:if test="${'NZL'==model.homeCountry}">selected</c:if>>New Zealand</option>
-					<option value="NIC"  <c:if test="${'NIC'==model.homeCountry}">selected</c:if>>Nicaragua</option>
-					<option value="NER"  <c:if test="${'NER'==model.homeCountry}">selected</c:if>>Niger</option>
-					<option value="NGA"  <c:if test="${'NGA'==model.homeCountry}">selected</c:if>>Nigeria</option>
-					<option value="NIU"  <c:if test="${'NIU'==model.homeCountry}">selected</c:if>>Niue</option>
-					<option value="NFK"  <c:if test="${'NFK'==model.homeCountry}">selected</c:if>>Norfolk Island</option>
-					<option value="MNP"  <c:if test="${'MNP'==model.homeCountry}">selected</c:if>>Northern Mariana Islands</option>
-					<option value="NOR"  <c:if test="${'NOR'==model.homeCountry}">selected</c:if>>Norway</option>
-					<option value="OMN"  <c:if test="${'OMN'==model.homeCountry}">selected</c:if>>Oman</option>
-					<option value="PAK"  <c:if test="${'PAK'==model.homeCountry}">selected</c:if>>Pakistan</option>
-					<option value="PLW"  <c:if test="${'PLW'==model.homeCountry}">selected</c:if>>Palau</option>
-					<option value="PSE"  <c:if test="${'PSE'==model.homeCountry}">selected</c:if>>Palestinian Territory, Occupied</option>
-					<option value="PAN"  <c:if test="${'PAN'==model.homeCountry}">selected</c:if>>Panama</option>
-					<option value="PNG"  <c:if test="${'PNG'==model.homeCountry}">selected</c:if>>Papua New Guinea</option>
-					<option value="PRY"  <c:if test="${'PRY'==model.homeCountry}">selected</c:if>>Paraguay</option>
-					<option value="PER"  <c:if test="${'PER'==model.homeCountry}">selected</c:if>>Peru</option>
-					<option value="PHL"  <c:if test="${'PHL'==model.homeCountry}">selected</c:if>>Philippines</option>
-					<option value="PCN"  <c:if test="${'PCN'==model.homeCountry}">selected</c:if>>Pitcairn</option>
-					<option value="POL"  <c:if test="${'POL'==model.homeCountry}">selected</c:if>>Poland</option>
-					<option value="PRT"  <c:if test="${'PRT'==model.homeCountry}">selected</c:if>>Portugal</option>
-					<option value="PRI"  <c:if test="${'PRI'==model.homeCountry}">selected</c:if>>Puerto Rico</option>
-					<option value="QAT"  <c:if test="${'QAT'==model.homeCountry}">selected</c:if>>Qatar</option>
-					<option value="REU"  <c:if test="${'REU'==model.homeCountry}">selected</c:if>>Réunion</option>
-					<option value="ROU"  <c:if test="${'ROU'==model.homeCountry}">selected</c:if>>Romania</option>
-					<option value="RUS"  <c:if test="${'RUS'==model.homeCountry}">selected</c:if>>Russian Federation</option>
-					<option value="RWA"  <c:if test="${'RWA'==model.homeCountry}">selected</c:if>>Rwanda</option>
-					<option value="BLM"  <c:if test="${'BLM'==model.homeCountry}">selected</c:if>>Saint Barthélemy</option>
-					<option value="SHN"  <c:if test="${'SHN'==model.homeCountry}">selected</c:if>>Saint Helena, Ascension and Tristan da Cunha</option>
-					<option value="KNA"  <c:if test="${'KNA'==model.homeCountry}">selected</c:if>>Saint Kitts and Nevis</option>
-					<option value="LCA"  <c:if test="${'LCA'==model.homeCountry}">selected</c:if>>Saint Lucia</option>
-					<option value="MAF"  <c:if test="${'MAF'==model.homeCountry}">selected</c:if>>Saint Martin (French part)</option>
-					<option value="SPM"  <c:if test="${'SPM'==model.homeCountry}">selected</c:if>>Saint Pierre and Miquelon</option>
-					<option value="VCT"  <c:if test="${'VCT'==model.homeCountry}">selected</c:if>>Saint Vincent and the Grenadines</option>
-					<option value="WSM"  <c:if test="${'WSM'==model.homeCountry}">selected</c:if>>Samoa</option>
-					<option value="SMR"  <c:if test="${'SMR'==model.homeCountry}">selected</c:if>>San Marino</option>
-					<option value="STP"  <c:if test="${'STP'==model.homeCountry}">selected</c:if>>Sao Tome and Principe</option>
-					<option value="SAU"  <c:if test="${'SAU'==model.homeCountry}">selected</c:if>>Saudi Arabia</option>
-					<option value="SEN"  <c:if test="${'SEN'==model.homeCountry}">selected</c:if>>Senegal</option>
-					<option value="SRB"  <c:if test="${'SRB'==model.homeCountry}">selected</c:if>>Serbia</option>
-					<option value="SYC"  <c:if test="${'SYC'==model.homeCountry}">selected</c:if>>Seychelles</option>
-					<option value="SLE"  <c:if test="${'SLE'==model.homeCountry}">selected</c:if>>Sierra Leone</option>
-					<option value="SGP"  <c:if test="${'SGP'==model.homeCountry}">selected</c:if>>Singapore</option>
-					<option value="SXM"  <c:if test="${'SXM'==model.homeCountry}">selected</c:if>>Sint Maarten (Dutch part)</option>
-					<option value="SVK"  <c:if test="${'SVK'==model.homeCountry}">selected</c:if>>Slovakia</option>
-					<option value="SVN"  <c:if test="${'SVN'==model.homeCountry}">selected</c:if>>Slovenia</option>
-					<option value="SLB"  <c:if test="${'SLB'==model.homeCountry}">selected</c:if>>Solomon Islands</option>
-					<option value="SOM"  <c:if test="${'SOM'==model.homeCountry}">selected</c:if>>Somalia</option>
-					<option value="ZAF"  <c:if test="${'ZAF'==model.homeCountry}">selected</c:if>>South Africa</option>
-					<option value="SGS"  <c:if test="${'SGS'==model.homeCountry}">selected</c:if>>South Georgia and the South Sandwich Islands</option>
-					<option value="SSD"  <c:if test="${'SSD'==model.homeCountry}">selected</c:if>>South Sudan</option>
-					<option value="ESP"  <c:if test="${'ESP'==model.homeCountry}">selected</c:if>>Spain</option>
-					<option value="LKA"  <c:if test="${'LKA'==model.homeCountry}">selected</c:if>>Sri Lanka</option>
-					<option value="SDN"  <c:if test="${'SDN'==model.homeCountry}">selected</c:if>>Sudan</option>
-					<option value="SUR"  <c:if test="${'SUR'==model.homeCountry}">selected</c:if>>Suriname</option>
-					<option value="SJM"  <c:if test="${'SJM'==model.homeCountry}">selected</c:if>>Svalbard and Jan Mayen</option>
-					<option value="SWZ"  <c:if test="${'SWZ'==model.homeCountry}">selected</c:if>>Swaziland</option>
-					<option value="SWE"  <c:if test="${'SWE'==model.homeCountry}">selected</c:if>>Sweden</option>
-					<option value="CHE"  <c:if test="${'CHE'==model.homeCountry}">selected</c:if>>Switzerland</option>
-					<option value="SYR"  <c:if test="${'SYR'==model.homeCountry}">selected</c:if>>Syrian Arab Republic</option>
-					<option value="TWN"  <c:if test="${'TWN'==model.homeCountry}">selected</c:if>>Taiwan, Province of China</option>
-					<option value="TJK"  <c:if test="${'TJK'==model.homeCountry}">selected</c:if>>Tajikistan</option>
-					<option value="TZA"  <c:if test="${'TZA'==model.homeCountry}">selected</c:if>>Tanzania, United Republic of</option>
-					<option value="THA"  <c:if test="${'THA'==model.homeCountry}">selected</c:if>>Thailand</option>
-					<option value="TLS"  <c:if test="${'TLS'==model.homeCountry}">selected</c:if>>Timor-Leste</option>
-					<option value="TGO"  <c:if test="${'TGO'==model.homeCountry}">selected</c:if>>Togo</option>
-					<option value="TKL"  <c:if test="${'TKL'==model.homeCountry}">selected</c:if>>Tokelau</option>
-					<option value="TON"  <c:if test="${'TON'==model.homeCountry}">selected</c:if>>Tonga</option>
-					<option value="TTO"  <c:if test="${'TTO'==model.homeCountry}">selected</c:if>>Trinidad and Tobago</option>
-					<option value="TUN"  <c:if test="${'TUN'==model.homeCountry}">selected</c:if>>Tunisia</option>
-					<option value="TUR"  <c:if test="${'TUR'==model.homeCountry}">selected</c:if>>Turkey</option>
-					<option value="TKM"  <c:if test="${'TKM'==model.homeCountry}">selected</c:if>>Turkmenistan</option>
-					<option value="TCA"  <c:if test="${'TCA'==model.homeCountry}">selected</c:if>>Turks and Caicos Islands</option>
-					<option value="TUV"  <c:if test="${'TUV'==model.homeCountry}">selected</c:if>>Tuvalu</option>
-					<option value="UGA"  <c:if test="${'UGA'==model.homeCountry}">selected</c:if>>Uganda</option>
-					<option value="UKR"  <c:if test="${'UKR'==model.homeCountry}">selected</c:if>>Ukraine</option>
-					<option value="ARE"  <c:if test="${'ARE'==model.homeCountry}">selected</c:if>>United Arab Emirates</option>
-					<option value="GBR"  <c:if test="${'GBR'==model.homeCountry}">selected</c:if>>United Kingdom</option>
-					<option value="USA"  <c:if test="${'USA'==model.homeCountry}">selected</c:if>>United States</option>
-					<option value="UMI"  <c:if test="${'UMI'==model.homeCountry}">selected</c:if>>United States Minor Outlying Islands</option>
-					<option value="URY"  <c:if test="${'URY'==model.homeCountry}">selected</c:if>>Uruguay</option>
-					<option value="UZB"  <c:if test="${'UZB'==model.homeCountry}">selected</c:if>>Uzbekistan</option>
-					<option value="VUT"  <c:if test="${'VUT'==model.homeCountry}">selected</c:if>>Vanuatu</option>
-					<option value="VEN"  <c:if test="${'VEN'==model.homeCountry}">selected</c:if>>Venezuela, Bolivarian Republic of</option>
-					<option value="VNM"  <c:if test="${'VNM'==model.homeCountry}">selected</c:if>>Viet Nam</option>
-					<option value="VGB"  <c:if test="${'VGB'==model.homeCountry}">selected</c:if>>Virgin Islands, British</option>
-					<option value="VIR"  <c:if test="${'VIR'==model.homeCountry}">selected</c:if>>Virgin Islands, U.S.</option>
-					<option value="WLF"  <c:if test="${'WLF'==model.homeCountry}">selected</c:if>>Wallis and Futuna</option>
-					<option value="ESH"  <c:if test="${'ESH'==model.homeCountry}">selected</c:if>>Western Sahara</option>
-					<option value="YEM"  <c:if test="${'YEM'==model.homeCountry}">selected</c:if>>Yemen</option>
-					<option value="ZMB"  <c:if test="${'ZMB'==model.homeCountry}">selected</c:if>>Zambia</option>
-					<option value="ZWE"  <c:if test="${'ZWE'==model.homeCountry}">selected</c:if>>Zimbabwe</option>
-				</select>
-				<label for="homeCountry"></label>
-			</td>
-			<th><s:Locale code="userinfo.homeRegion" />:</th>
-			<td>
-				<input type="text" id="homeRegion" name="homeRegion"  title="" value="${model.homeRegion}"/>
-				<label for="homeRegion"></label>
-			</td>
-		</tr>
-		<tr>
-			
-			<th><s:Locale code="userinfo.homeLocality" />:</th>
-			<td>
-				<input type="text" id="homeLocality" name="homeLocality"  title="" value="${model.homeLocality}"/>
-				<label for="homeLocality"></label>
-			</td>
-			<th><s:Locale code="userinfo.homeStreetAddress" />:</th>
-			<td>
-				<input type="text" id="homeStreetAddress" name="homeStreetAddress"  title="" value="${model.homeStreetAddress}"/>
-				<label for="homeStreetAddress"></label>
-			</td>
-		</tr>
-		<tr>
-			
-			<th><s:Locale code="userinfo.homePostalCode" />:</th>
-			<td>
-				<input type="text" id="homePostalCode" name="homePostalCode"  title="" value="${model.homePostalCode}"/>
-				<label for="homePostalCode"></label>
-			</td>
-			<th><s:Locale code="userinfo.homeFax" />:</th>
-			<td>
-				<input type="text" id="homeFax" name="homeFax"  title="" value="${model.homeFax}"/>
-				<label for="homeFax"></label>
-			</td>
-		</tr>
-		
-		<tr>
-			<th><s:Locale code="userinfo.homePhoneNumber" />:</th>
-			<td>
-				<input type="text" id="homePhoneNumber" name="homePhoneNumber"  title="" value="${model.homePhoneNumber}"/>
-				<label for="homePhoneNumber"></label>
-			</td>
-			<th><s:Locale code="userinfo.homeEmail" />:</th>
-			<td >
-				<input type="text" id="homeEmail" name="homeEmail"  title="" value="${model.homeEmail}"/>
-				<label for="homeEmail"></label>
-			</td>
-		</tr>
-		<tr>
-			<td colspan="4">&nbsp;
-			</td>
-			
-		</tr>
-		<tr>
-					<th><s:Locale code="QQ" />:</th>
-					<td>
-						<input type="text" id="qq" name="qq"  title="" value="${model.qq}"/>
-						<label for="qq"></label>
-					</td>
-					<th><s:Locale code="userinfo.ims.weixin" />:</th>
-					<td >
-						<input type="text" id="weixin" name="weixin"  title="" value="${model.weixin}"/>
-						<label for="weixin"></label>
-					</td>
-				</tr>
-				<tr>
-					<th><s:Locale code="userinfo.ims.sinaweibo" />:</th>
-					<td>
-						<input type="text" id="sinaweibo" name="sinaweibo"  title="" value="${model.sinaweibo}"/>
-						<label for="sinaweibo"></label>
-					</td>
-					<th><s:Locale code="userinfo.ims.yixin" />:</th>
-					<td >
-						<input type="text" id="yixin" name="yixin"  title="" value="${model.yixin}"/>
-						<label for="weixin"></label>
-					</td>
-				</tr>
-				<tr>
-					<th><s:Locale code="Facebook" />:</th>
-					<td>
-						<input type="text" id="facebook" name="facebook"  title="" value="${model.facebook}"/>
-						<label for="facebook"></label>
-					</td>
-					<th><s:Locale code="Skype" />:</th>
-					<td >
-						<input type="text" id="skype" name="skype"  title="" value="${model.skype}"/>
-						<label for="weixin"></label>
-					</td>
-				</tr>
-				<tr>
-					<th><s:Locale code="MSN" />:</th>
-					<td>
-						<input type="text" id="msn" name="msn"  title="" value="${model.msn}"/>
-						<label for="msn"></label>
-					</td>
-					<th><s:Locale code="GTalk" />:</th>
-					<td >
-						<input type="text" id="gtalk" name="gtalk"  title="" value="${model.gtalk}"/>
-						<label for="gtalk"></label>
-					</td>
-				</tr>
-				<tr>
-					<th><s:Locale code="YAHOO" />:</th>
-					<td>
-						<input type="text" id="yahoo" name="yahoo"  title="" value="${model.yahoo}"/>
-						<label for="yahoo"></label>
-					</td>
-					<th><s:Locale code="LINE" />:</th>
-					<td >
-						<input type="text" id="line" name="line"  title="" value="${model.line}"/>
-						<label for="line"></label>
-					</td>
-				</tr>
-				<tr>
-					<th><s:Locale code="AIM" />:</th>
-					<td>
-						<input type="text" id="aim" name="aim"  title="" value="${model.aim}"/>
-						<label for="aim"></label>
-					</td>
-					<th><s:Locale code="userinfo.ims.define" />:</th>
-					<td >
-						<input type="text" id="defineIm" name="defineIm"  title="" value="${model.defineIm}"/>
-						<label for="defineIm"></label>
-					</td>
-				</tr>
-	</tbody>
-</table>

+ 8 - 8
maxkey-web-manage/src/main/resources/templates/views/userinfo/usersList.ftl

@@ -67,22 +67,22 @@
 				<td colspan="2"> 
 					 <div id="tool_box_right">
 					 	<input class="button btn btn-warning mr-3 window" id="changepwdBtn" type="button" value="<@locale code="login.password.changepassword"/>" 
-						 		    wurl="<@base/>/users/forwardChangePassword" wwidth="600px" wheight="250px" />
+						 		    wurl="<@base/>/userinfo/forwardChangePassword" wwidth="600px" wheight="250px" />
 						 		    
 						 <input class="button btn btn-success mr-3" id="addBtn" type="button" value="<@locale code="button.text.add"/>" 
-						 		    wurl="<@base/>/users/forwardSelectUserType"
+						 		    wurl="<@base/>/userinfo/forwardAdd"
 						 		    wwidth="960"
 						 		    wheight="600"
 					 		    	target="window">	    	
 					 		    	
 					 	<input class="button btn btn-info mr-3 " id="modifyBtn" type="button" value="<@locale code="button.text.edit"/>" 
-					 				wurl="<@base/>/users/forwardUpdate"
+					 				wurl="<@base/>/userinfo/forwardUpdate"
 					 				wwidth="960"
 						 		    wheight="600"
 					 		    	target="window"> 
 					 		    	
 					 	<input class="button btn btn-danger mr-3 "  id="deleteBtn" type="button" value="<@locale code="button.text.delete"/>"
-					 				wurl="<@base/>/users/delete" />
+					 				wurl="<@base/>/userinfo/delete" />
 					</div>
 				</td>
 			</tr>
@@ -103,7 +103,6 @@
 		 			<td width="360px">
 						<input class="form-control"  type="text" id="employeeNumber" name="employeeNumber"  title="" value=""/>
 			 			</td>
-		 			
 			 </tr>
 			 <tr>
 					<td width="120px"><@locale code="userinfo.department"/></td>
@@ -115,8 +114,8 @@
 	 				<td width="120px"><@locale code="userinfo.userType"/></td>
 		 			<td width="360px">
 		 				<input class="form-control"  class="userTypeId" name="userType" type="text" style="display:none;"  >
-		 				<input class="form-control"  class="userTypeName" name="userTypeName" type="text" style="width:70%;;float:left;"  >
-		 				<input class="window button btn btn-secondary mr-3 " type="button"   size="50" value="<@locale code="button.text.select"/>" title="UserType" wurl="/usertype//selectUserTypeList" wwidth="700" wheight="500" />
+		 				<input class="form-control"  class="userTypeName" name="userTypeName" type="text" style="float:left;"  >
+		 				
 		 			</td>
 		 			
 			 </tr>
@@ -137,7 +136,8 @@
 			data-side-pagination="server">
 		<thead>
 			<tr>
-			<th data-sortable="true" data-field="id"   data-visible="false"><@locale code="log.loginhistory.id"/></th>
+			<th data-sortable="true" data-field="id"   data-visible="false"><@locale code="userinfo.id"/></th>
+			<th data-field="id"><@locale code="apps.icon"/></th>
 			<th data-field="icon"><@locale code="apps.icon"/></th>
 			<th data-field="username"><@locale code="userinfo.username"/></th>
 			<th data-field="displayName"><@locale code="userinfo.displayName"/></th>

+ 0 - 0
maxkey-web-manage/src/main/resources/templates/views/userinfo/usersSelect.jsp → maxkey-web-manage/src/main/resources/templates/views/userinfo/usersSelect.ftl


+ 0 - 1
maxkey-web-maxkey/src/main/java/org/maxkey/web/interceptor/PermissionAdapter.java

@@ -8,7 +8,6 @@ import javax.servlet.http.HttpServletRequest;
 import javax.servlet.http.HttpServletResponse;
 
 import org.maxkey.config.ApplicationConfig;
-import org.maxkey.dao.service.NavigationsService;
 import org.maxkey.domain.Navigations;
 import org.maxkey.domain.UserInfo;
 import org.maxkey.web.WebContext;

+ 40 - 40
maxkey-web-maxkey/src/main/resources/templates/views/profile/myProfile.ftl

@@ -33,13 +33,13 @@
 				<tr>
 					<th style="width:15%;"><@locale code="userinfo.username" />:</th>
 					<td style="width:35%;">
-					<input  class="form-control"  type="hidden" id="id" name="id" value="${model.id}"/>
-						<input  class="form-control"  type="text" readonly id="username" name="username"  title="" value="${model.username}"/>
+					<input  class="form-control"  type="hidden" id="id" name="id" value="${model.id!}"/>
+						<input  class="form-control"  type="text" readonly id="username" name="username"  title="" value="${model.username!}"/>
 						<label for="username"></label>
 					</td>
 					<th style="width:15%;"><@locale code="userinfo.userType" />:</th>
 					<td  style="width:35%;">
-						<input readonly type="text" id="userType" name="userType"  title="" value="${model.userType }"/>
+						<input readonly type="text" id="userType" name="userType"  title="" value="${model.userType !}"/>
 					</td>
 				</tr>
 				<tr>
@@ -50,7 +50,7 @@
 				<tr>
 					<th><@locale code="userinfo.displayName" />:</th>
 					<td>
-						<input class="form-control"  type="text" id="displayName" name="displayName"  title="" value="${model.displayName}"/>
+						<input class="form-control"  type="text" id="displayName" name="displayName"  title="" value="${model.displayName!}"/>
 						<label for="displayName"></label>
 					</td>
 					<th rowspan="4"><@locale code="userinfo.picture" />:</th>
@@ -67,7 +67,7 @@
 				<tr>
 					<th><@locale code="userinfo.familyName" />:</th>
 					<td>
-						<input class="form-control"  type="text" id="familyName" name="familyName"  title="" value="${model.familyName}"/>
+						<input class="form-control"  type="text" id="familyName" name="familyName"  title="" value="${model.familyName!}"/>
 						<b class="orange">*</b><label for="familyName"></label>
 					</td>
 					
@@ -77,7 +77,7 @@
 				<tr>
 					<th><@locale code="userinfo.givenName" />:</th>
 					<td>
-						<input class="form-control"  type="text" id="givenName" name="givenName"  title="" value="${model.givenName}"/>
+						<input class="form-control"  type="text" id="givenName" name="givenName"  title="" value="${model.givenName!}"/>
 						<b class="orange">*</b><label for="givenName"></label>
 					</td>
 					
@@ -86,7 +86,7 @@
 				<tr>
 					<th><@locale code="userinfo.middleName" />:</th>
 					<td>
-						<input class="form-control"  type="text" id="middleName" name="middleName"  title="" value="${model.middleName}"/>
+						<input class="form-control"  type="text" id="middleName" name="middleName"  title="" value="${model.middleName!}"/>
 						<label for="middleName"></label>
 					</td>
 					
@@ -96,7 +96,7 @@
 					
 					<th><@locale code="userinfo.nickName" />:</th>
 					<td>
-						<input class="form-control"  type="text" id="nickName" name="nickName"  title="" value="${model.nickName}"/>
+						<input class="form-control"  type="text" id="nickName" name="nickName"  title="" value="${model.nickName!}"/>
 						<label for="nickName"></label>
 					</td>
 					<th><@locale code="userinfo.gender" />:</th>
@@ -123,7 +123,7 @@
 					</td>
 					<th><@locale code="userinfo.website" />:</th>
 					<td>
-						<input class="form-control"  type="text" id="webSite" name="webSite"  title="" value="${model.webSite}"/>
+						<input class="form-control"  type="text" id="webSite" name="webSite"  title="" value="${model.webSite!}"/>
 						<label for="webSite"></label>
 						
 					</td>
@@ -142,7 +142,7 @@
 					
 					<th><@locale code="userinfo.idCardNo" />:</th>
 					<td>
-						<input class="form-control"  type="text" id="idCardNo" name="idCardNo"  title="" value="${model.idCardNo}"/>
+						<input class="form-control"  type="text" id="idCardNo" name="idCardNo"  title="" value="${model.idCardNo!}"/>
 						<label for="idCardNo"></label>
 					</td>
 				</tr>
@@ -154,7 +154,7 @@
 				<tr>
 					<th><@locale code="userinfo.startWorkDate" />:</th>
 					<td>
-						<input class="form-control"  type="text"  class="datepicker"  id="startWorkDate" name="startWorkDate"  title="" value="${model.startWorkDate}"/>
+						<input class="form-control"  type="text"  class="datepicker"  id="startWorkDate" name="startWorkDate"  title="" value="${model.startWorkDate!}"/>
 						<label for="startWorkDate"></label>
 					</td>
 					<th><@locale code="userinfo.preferredLanguage" />:</th>
@@ -315,24 +315,24 @@
 				<tr>
 					<th><@locale code="userinfo.employeeNumber" />:</th>
 					<td>
-						<input class="form-control"  readonly type="text" id="employeeNumber" name="employeeNumber"  title="" value="${model.employeeNumber}"/>
+						<input class="form-control"  readonly type="text" id="employeeNumber" name="employeeNumber"  title="" value="${model.employeeNumber!}"/>
 						<label for="username"></label>
 					</td>
 					<th><@locale code="userinfo.windowsAccount" />:</th>
 					<td>
-						<input class="form-control"  type="text" id="windowsAccount" name="windowsAccount"  title="" value="${model.windowsAccount}"/>
+						<input class="form-control"  type="text" id="windowsAccount" name="windowsAccount"  title="" value="${model.windowsAccount!}"/>
 						<label for="windowsAccount"></label>
 					</td>
 				</tr>
 				<tr>
 					<th><@locale code="userinfo.organization" />:</th>
 					<td>
-						<input class="form-control"  type="text" id="organization" name="organization"  title="" value="${model.organization}"/>
+						<input class="form-control"  type="text" id="organization" name="organization"  title="" value="${model.organization!}"/>
 						<label for="organization"></label>
 					</td>
 					<th><@locale code="userinfo.division" />:</th>
 					<td>
-						<input class="form-control"  type="text" id="division" name="division"  title="" value="${model.division}"/>
+						<input class="form-control"  type="text" id="division" name="division"  title="" value="${model.division!}"/>
 						<label for="division"></label>
 					</td>
 					
@@ -341,13 +341,13 @@
 				<tr>
 					<th><@locale code="userinfo.department" />:</th>
 					<td>
-						<input class="form-control"  type="hidden" id="departmentId" name="departmentId"  title="" value="${model.departmentId}"/>
-						<input class="form-control"  type="text" id="department" name="department"  title="" value="${model.department}"/>
+						<input class="form-control"  type="hidden" id="departmentId" name="departmentId"  title="" value="${model.departmentId!}"/>
+						<input class="form-control"  type="text" id="department" name="department"  title="" value="${model.department!}"/>
 						<label for="department"></label>
 					</td>
 					<th><@locale code="userinfo.costCenter" />:</th>
 					<td>
-						<input class="form-control"  type="text" id="costCenter" name="costCenter"  title="" value="${model.costCenter}"/>
+						<input class="form-control"  type="text" id="costCenter" name="costCenter"  title="" value="${model.costCenter!}"/>
 						<label for="costCenter"></label>
 					</td>
 					
@@ -355,38 +355,38 @@
 				<tr>
 					<th><@locale code="userinfo.jobTitle" />:</th>
 					<td>
-						<input class="form-control"  type="text" id="jobTitle" name="jobTitle"  title="" value="${model.jobTitle}"/>
+						<input class="form-control"  type="text" id="jobTitle" name="jobTitle"  title="" value="${model.jobTitle!}"/>
 						<label for="jobTitle"></label>
 					</td>
 					<th><@locale code="userinfo.jobLevel" />:</th>
 					<td>
-						<input class="form-control"  type="text" id="jobLevel" name="jobLevel"  title="" value="${model.jobLevel}"/>
+						<input class="form-control"  type="text" id="jobLevel" name="jobLevel"  title="" value="${model.jobLevel!}"/>
 						<label for="jobLevel"></label>
 					</td>
 				</tr>
 				<tr>
 					<th><@locale code="userinfo.manager" />:</th>
 					<td>
-						<input class="form-control"  type="hidden" id="managerId" name="managerId"  title="" value="${model.managerId}"/>
-						<input class="form-control"  type="text" id="manager" name="manager"  title="" value="${model.manager}"/>
+						<input class="form-control"  type="hidden" id="managerId" name="managerId"  title="" value="${model.managerId!}"/>
+						<input class="form-control"  type="text" id="manager" name="manager"  title="" value="${model.manager!}"/>
 						<label for="manager"></label>
 					</td>
 					<th><@locale code="userinfo.assistant" />:</th>
 					<td>
-						<input class="form-control"  type="hidden" id="assistantId" name="assistantId"  title="" value="${model.assistantId}"/>
-						<input class="form-control"   type="text" id="assistant" name="assistant"  title="" value="${model.assistant}"/>
+						<input class="form-control"  type="hidden" id="assistantId" name="assistantId"  title="" value="${model.assistantId!}"/>
+						<input class="form-control"   type="text" id="assistant" name="assistant"  title="" value="${model.assistant!}"/>
 						<label for="delegatedApprover"></label>
 					</td>
 				</tr>
 				<tr>
 					<th><@locale code="userinfo.entryDate" />:</th>
 					<td>
-						<input class="form-control"  type="text" class="datepicker"  id="entryDate" name="entryDate"  title="" value="${model.entryDate}"/>
+						<input class="form-control"  type="text" class="datepicker"  id="entryDate" name="entryDate"  title="" value="${model.entryDate!}"/>
 						<label for="entryDate"></label>
 					</td>
 					<th><@locale code="userinfo.quitDate" />:</th>
 					<td>
-						<input class="form-control"   type="text" class="datepicker"  id="quitDate" name="quitDate"  title="" value="${model.quitDate}"/>
+						<input class="form-control"   type="text" class="datepicker"  id="quitDate" name="quitDate"  title="" value="${model.quitDate!}"/>
 						<label for="delegatedApprover"></label>
 					</td>
 				</tr>
@@ -653,7 +653,7 @@
 					</td>
 					<th><@locale code="userinfo.workRegion" />:</th>
 					<td>
-						<input class="form-control"  type="text" id="workRegion" name="workRegion"  title="" value="${model.workRegion}"/>
+						<input class="form-control"  type="text" id="workRegion" name="workRegion"  title="" value="${model.workRegion!}"/>
 						<label for="province"></label>
 					</td>
 				</tr>
@@ -661,12 +661,12 @@
 					
 					<th><@locale code="userinfo.workLocality" />:</th>
 					<td>
-						<input class="form-control"  type="text" id="workLocality" name="workLocality"  title="" value="${model.workLocality}"/>
+						<input class="form-control"  type="text" id="workLocality" name="workLocality"  title="" value="${model.workLocality!}"/>
 						<label for="workLocality"></label>
 					</td>
 					<th><@locale code="userinfo.workStreetAddress" />:</th>
 					<td>
-						<input class="form-control"  type="text" id="workStreetAddress" name="workStreetAddress"  title="" value="${model.workStreetAddress}"/>
+						<input class="form-control"  type="text" id="workStreetAddress" name="workStreetAddress"  title="" value="${model.workStreetAddress!}"/>
 						<label for="street"></label>
 					</td>
 				</tr>
@@ -674,12 +674,12 @@
 					
 					<th><@locale code="userinfo.workPostalCode" />:</th>
 					<td>
-						<input class="form-control"  type="text" id="workPostalCode" name="workPostalCode"  title="" value="${model.workPostalCode}"/>
+						<input class="form-control"  type="text" id="workPostalCode" name="workPostalCode"  title="" value="${model.workPostalCode!}"/>
 						<label for="workPostalCode"></label>
 					</td>
 					<th><@locale code="userinfo.workFax" />:</th>
 					<td>
-						<input class="form-control"  type="text" id="workFax" name="workFax"  title="" value="${model.workFax}"/>
+						<input class="form-control"  type="text" id="workFax" name="workFax"  title="" value="${model.workFax!}"/>
 						<label for="workFax"></label>
 					</td>
 				</tr>
@@ -687,12 +687,12 @@
 				<tr>
 					<th><@locale code="userinfo.workPhoneNumber" />:</th>
 					<td>
-						<input class="form-control"  type="text" id="workPhoneNumber" name="workPhoneNumber"  title="" value="${model.workPhoneNumber}"/>
+						<input class="form-control"  type="text" id="workPhoneNumber" name="workPhoneNumber"  title="" value="${model.workPhoneNumber!}"/>
 						<label for="workPhoneNumber"></label>
 					</td>
 					<th><@locale code="userinfo.workEmail" />:</th>
 					<td>
-						<input class="form-control"  type="text" id="workEmail" name="workEmail"  title="" value="${model.workEmail}"/>
+						<input class="form-control"  type="text" id="workEmail" name="workEmail"  title="" value="${model.workEmail!}"/>
 						<label for="workEmail"></label>
 					</td>
 					
@@ -961,7 +961,7 @@
 					</td>
 					<th><@locale code="userinfo.homeRegion" />:</th>
 					<td>
-						<input class="form-control"  type="text" id="homeRegion" name="homeRegion"  title="" value="${model.homeRegion}"/>
+						<input class="form-control"  type="text" id="homeRegion" name="homeRegion"  title="" value="${model.homeRegion!}"/>
 						<label for="homeRegion"></label>
 					</td>
 				</tr>
@@ -969,12 +969,12 @@
 					
 					<th><@locale code="userinfo.homeLocality" />:</th>
 					<td>
-						<input class="form-control"  type="text" id="homeLocality" name="homeLocality"  title="" value="${model.homeLocality}"/>
+						<input class="form-control"  type="text" id="homeLocality" name="homeLocality"  title="" value="${model.homeLocality!}"/>
 						<label for="homeLocality"></label>
 					</td>
 					<th><@locale code="userinfo.homeStreetAddress" />:</th>
 					<td>
-						<input class="form-control"  type="text" id="homeStreetAddress" name="homeStreetAddress"  title="" value="${model.homeStreetAddress}"/>
+						<input class="form-control"  type="text" id="homeStreetAddress" name="homeStreetAddress"  title="" value="${model.homeStreetAddress!}"/>
 						<label for="homeStreetAddress"></label>
 					</td>
 				</tr>
@@ -982,12 +982,12 @@
 					
 					<th><@locale code="userinfo.homePostalCode" />:</th>
 					<td>
-						<input class="form-control"  type="text" id="homePostalCode" name="homePostalCode"  title="" value="${model.homePostalCode}"/>
+						<input class="form-control"  type="text" id="homePostalCode" name="homePostalCode"  title="" value="${model.homePostalCode!}"/>
 						<label for="homePostalCode"></label>
 					</td>
 					<th><@locale code="userinfo.homeFax" />:</th>
 					<td>
-						<input class="form-control"  type="text" id="homeFax" name="homeFax"  title="" value="${model.homeFax}"/>
+						<input class="form-control"  type="text" id="homeFax" name="homeFax"  title="" value="${model.homeFax!}"/>
 						<label for="homeFax"></label>
 					</td>
 				</tr>
@@ -995,12 +995,12 @@
 				<tr>
 					<th><@locale code="userinfo.homePhoneNumber" />:</th>
 					<td>
-						<input class="form-control"  type="text" id="homePhoneNumber" name="homePhoneNumber"  title="" value="${model.homePhoneNumber}"/>
+						<input class="form-control"  type="text" id="homePhoneNumber" name="homePhoneNumber"  title="" value="${model.homePhoneNumber!}"/>
 						<label for="homePhoneNumber"></label>
 					</td>
 					<th><@locale code="userinfo.homeEmail" />:</th>
 					<td >
-						<input class="form-control"  type="text" id="homeEmail" name="homeEmail"  title="" value="${model.homeEmail}"/>
+						<input class="form-control"  type="text" id="homeEmail" name="homeEmail"  title="" value="${model.homeEmail!}"/>
 						<label for="homeEmail"></label>
 					</td>
 				</tr>