diff --git a/src/main/java/cokr/xit/fims/base/UserController.java b/src/main/java/cokr/xit/fims/base/UserController.java index 1c7e22c7..a9302aae 100644 --- a/src/main/java/cokr/xit/fims/base/UserController.java +++ b/src/main/java/cokr/xit/fims/base/UserController.java @@ -82,6 +82,22 @@ public class UserController extends cokr.xit.base.user.web.UserController ableFactionList = factionMapper.selectAbleFactionList(params); + mav.addObject("ableFactionList", ableFactionList); + + return mav; + } + + @RequestMapping(name="설정정보 조회",value="/stngInfo.do") public ModelAndView getStngInfo(String type) { ModelAndView mav = new ModelAndView("jsonView"); diff --git a/src/main/webapp/WEB-INF/jsp/fims/user/user-info.jsp b/src/main/webapp/WEB-INF/jsp/fims/user/user-info.jsp new file mode 100644 index 00000000..e6a96426 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/fims/user/user-info.jsp @@ -0,0 +1,329 @@ +<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" isELIgnored="false" session="false"%> +<%@ include file="/WEB-INF/jsp/include/taglib.jsp"%> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +사용자정보 + + + +
+
+
+
+
+ +
+
+ + +
+
+
+ +
+ +
+
+
+
+
+
+ +
+ + +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+ +
+
+ +
+ +
+
+
+
+
+ +
+ +
+ + +
+
+ + +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+ +
+ +
+
+
+
+
+
+
+
+ +
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/include/top.jsp b/src/main/webapp/WEB-INF/jsp/include/top.jsp index cc568833..53bf4a39 100644 --- a/src/main/webapp/WEB-INF/jsp/include/top.jsp +++ b/src/main/webapp/WEB-INF/jsp/include/top.jsp @@ -103,12 +103,18 @@
    • -
  • +
  • 계정 정보 수정
    • +
  • + + + 비밀번호 변경 + +
  • @@ -172,6 +178,14 @@ +function fnOpenMyInfo(){ + window.open( + wctx.url("/user/openMyInfo.do") + ,"changeMyInfo" + ,'top=10, left=10, width=950, height=500' + ); +} + function showHelp(){ dialog.alert({ content: '070-4490-74XX',