diff --git a/src/main/java/com/mca/cmmn/web/CommonController.java b/src/main/java/com/mca/cmmn/web/CommonController.java index b3f10de..ee1b290 100644 --- a/src/main/java/com/mca/cmmn/web/CommonController.java +++ b/src/main/java/com/mca/cmmn/web/CommonController.java @@ -88,7 +88,7 @@ public class CommonController { @RequestMapping(value="/join") public String join() throws Exception { try { - return "join"; + return "anonymous/html/join"; } catch (Exception e) { // TODO: handle exception e.printStackTrace(); @@ -136,7 +136,7 @@ public class CommonController { return "/redirect"; }else { model.addAttribute("resultMsg", "오류가 발생하였습니다."); - return "/join"; + return null; } } catch (Exception e) { // TODO: handle exception @@ -173,7 +173,7 @@ public class CommonController { @RequestMapping(value = "findId") public String findIdView(){ - return "findId"; + return "anonymous/findId"; } // 아이디 찾기 실행 @@ -188,13 +188,13 @@ public class CommonController { model.addAttribute("id", user.getUserid()); } - return "findId"; + return "anonymous/findId"; } //pw찾기 페이지 이동 @RequestMapping(value = "findPwd") public String findPwdView(){ - return "findPwd"; + return "anonymous/findPwd"; } //pw찾기 실행 @RequestMapping(value = "findPwd", method = RequestMethod.POST) @@ -207,7 +207,7 @@ public class CommonController { model.addAttribute("check", 0); model.addAttribute("updateid", user.getUserid()); } - return "findPwd"; + return "anonymous/findPwd"; } //pw 바꾸기 실행 @@ -217,7 +217,7 @@ public class CommonController { userVO.setUserid(id); System.out.println(userVO); userService.updatePwd(userVO); - return "findPwdConfirm"; + return "anonymous/findPwdConfirm"; } // 비밀번호 변경 성공페이지 이동 @@ -225,7 +225,7 @@ public class CommonController { UserVO loginUser = (UserVO) session.getAttribute("loginUser"); if (loginUser == null) { - return "login"; + return "/login"; } else { return "checkform"; } diff --git a/src/main/webapp/WEB-INF/jsp/findId.jsp b/src/main/webapp/WEB-INF/jsp/anonymous/findId.jsp similarity index 61% rename from src/main/webapp/WEB-INF/jsp/findId.jsp rename to src/main/webapp/WEB-INF/jsp/anonymous/findId.jsp index 0a76783..3da8c1b 100644 --- a/src/main/webapp/WEB-INF/jsp/findId.jsp +++ b/src/main/webapp/WEB-INF/jsp/anonymous/findId.jsp @@ -1,29 +1,9 @@ -<%@ page language="java" contentType="text/html; charset=utf-8" - pageEncoding="utf-8" %> +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %> <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> -<%@ page contentType="text/html;charset=UTF-8" language="java" %> - - - - - - 모바일센터 관리시스템 - - - " rel="stylesheet"> - " rel="stylesheet"> - " rel="stylesheet"> - - -
-
모바일센터 관리시스템
-
-
-
@@ -51,12 +31,10 @@ - 로그인 + 로그인
- - diff --git a/src/main/webapp/WEB-INF/jsp/anonymous/findPwd.jsp b/src/main/webapp/WEB-INF/jsp/anonymous/findPwd.jsp new file mode 100644 index 0000000..38e22b2 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/anonymous/findPwd.jsp @@ -0,0 +1,66 @@ +<%@ page language="java" contentType="text/html; charset=utf-8" pageEncoding="utf-8" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> +
+
+ + + + + + + + +
+ +
+ <%-- 이름번호 일치x --%> + + + + + + +
+ +
+ + + + + + + + + +
+
+ \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/findPwdConfirm.jsp b/src/main/webapp/WEB-INF/jsp/anonymous/findPwdConfirm.jsp similarity index 100% rename from src/main/webapp/WEB-INF/jsp/findPwdConfirm.jsp rename to src/main/webapp/WEB-INF/jsp/anonymous/findPwdConfirm.jsp diff --git a/src/main/webapp/WEB-INF/jsp/anonymous/join.jsp b/src/main/webapp/WEB-INF/jsp/anonymous/join.jsp new file mode 100644 index 0000000..178fd84 --- /dev/null +++ b/src/main/webapp/WEB-INF/jsp/anonymous/join.jsp @@ -0,0 +1,156 @@ +<%@ page language="java" contentType="text/html; charset=utf-8" + pageEncoding="utf-8" %> +<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> +<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> +<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %> +<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ + + + +
+ +
+ +
+ +
+ +
+ +
+ + +
+ +
+
+
+

※ 회원 가입을 요청한 후에 승인을 기다려주세요.

+

+
+ + + \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/findPwd.jsp b/src/main/webapp/WEB-INF/jsp/findPwd.jsp deleted file mode 100644 index b003144..0000000 --- a/src/main/webapp/WEB-INF/jsp/findPwd.jsp +++ /dev/null @@ -1,91 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=utf-8" - pageEncoding="utf-8" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> - -<%@ page contentType="text/html;charset=UTF-8" language="java" %> - - - - - - 모바일센터 관리시스템 - - - " rel="stylesheet"> - " rel="stylesheet"> - " rel="stylesheet"> - - -
-
모바일센터 관리시스템
-
-
- -
-
-
- - - - - - - - -
- -
-<%-- 이름번호 일치x --%> - - - - - - -
- -
- - - - - - - - - -
-
-
- - - \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/jsp/join.jsp b/src/main/webapp/WEB-INF/jsp/join.jsp deleted file mode 100644 index bf65c1f..0000000 --- a/src/main/webapp/WEB-INF/jsp/join.jsp +++ /dev/null @@ -1,185 +0,0 @@ -<%@ page language="java" contentType="text/html; charset=utf-8" - pageEncoding="utf-8" %> -<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %> -<%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> -<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %> -<%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> - - - - - - - - 모바일센터 관리시스템 - - - " rel="stylesheet"> - " rel="stylesheet"> - " rel="stylesheet"> - - -
-
모바일센터 관리시스템
-
-
- -
-
-

- 회원 정보 입력 -

-
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- - - - -
- -
- -
- -
- -
- -
- - -
- -
-
-
-

※ 회원 가입을 요청한 후에 승인을 기다려주세요.

-

-
- - - -
- - diff --git a/src/main/webapp/WEB-INF/jsp/layout/header.jsp b/src/main/webapp/WEB-INF/jsp/layout/header.jsp index 8b40bfc..d9e189d 100644 --- a/src/main/webapp/WEB-INF/jsp/layout/header.jsp +++ b/src/main/webapp/WEB-INF/jsp/layout/header.jsp @@ -18,6 +18,9 @@
+ + 모바일센터 관리시스템 + 모바일센터 관리시스템 diff --git a/src/main/webapp/WEB-INF/jsp/login.jsp b/src/main/webapp/WEB-INF/jsp/login.jsp index 144b61f..18ea77f 100644 --- a/src/main/webapp/WEB-INF/jsp/login.jsp +++ b/src/main/webapp/WEB-INF/jsp/login.jsp @@ -3,39 +3,71 @@ <%@ taglib prefix="form" uri="http://www.springframework.org/tags/form" %> <%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui" %> <%@ taglib prefix="spring" uri="http://www.springframework.org/tags" %> +
-
-
- - - - - - +
+ + + + + + + +
+
+ ">아이디 찾기 +
+ ">비밀번호 찾기 +
+
+ <%----%> + 회원가입 +
+
+ +
+
-
-
- - ">아이디 찾기 -
+
\ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tiles/tiles.xml b/src/main/webapp/WEB-INF/tiles/tiles.xml index 1ffa934..4f54141 100644 --- a/src/main/webapp/WEB-INF/tiles/tiles.xml +++ b/src/main/webapp/WEB-INF/tiles/tiles.xml @@ -19,13 +19,13 @@ - - - + + + - - - + + + diff --git a/src/main/webapp/css/style.css b/src/main/webapp/css/style.css index 3ad97d6..eea1dd4 100644 --- a/src/main/webapp/css/style.css +++ b/src/main/webapp/css/style.css @@ -371,24 +371,19 @@ a { overflow: hidden; } .join_top{ - width: 620px; - padding: 0px 0 10px; + padding: 0 0 10px; line-height:30px; - margin-bottom: 15px; - margin: 0 auto; + margin: 0 auto 15px; } .join_table{ - width: 620px; border-collapse: collapse; border-top: 2px solid #d9d9d9; margin: 0 auto; } .join_bottom{ - width: 620px; - padding: 0px 0 10px; + padding: 0 0 10px; line-height:30px; - margin-bottom: 15px; - margin: 0 auto; + margin: 0 auto 15px; }