From 41a7350deb8387b64c3124785b9b4e1603ad2416 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=EA=B0=95=EC=84=9D=20=EC=B5=9C?= <cks0504_p@daum.net>
Date: Fri, 11 Mar 2022 10:53:25 +0900
Subject: [PATCH] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EC=A0=95=EB=B3=B4=20?=
 =?UTF-8?q?=EB=AA=A8=EB=8B=AC=20=ED=81=AC=EA=B8=B0=20=EC=88=98=EC=A0=95.?=
 =?UTF-8?q?=20=ED=8E=98=EC=9D=B4=EC=A7=80=EB=84=A4=EC=9D=B4=EC=85=98=20?=
 =?UTF-8?q?=EB=A7=81=ED=81=AC=20=EC=9D=B4=EC=83=81=EB=8F=99=EC=9E=91=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/jsp/admin/userInfoView.jsp |   2 +-
 src/main/webapp/WEB-INF/jsp/map/userInfo.jsp  | 216 +++++++++---------
 src/main/webapp/js/admin/fieldData.js         |   2 +-
 src/main/webapp/js/admin/userinfo.js          |   2 +-
 4 files changed, 113 insertions(+), 109 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/admin/userInfoView.jsp b/src/main/webapp/WEB-INF/jsp/admin/userInfoView.jsp
index f812530..6e20224 100644
--- a/src/main/webapp/WEB-INF/jsp/admin/userInfoView.jsp
+++ b/src/main/webapp/WEB-INF/jsp/admin/userInfoView.jsp
@@ -10,7 +10,7 @@
             <input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}"/>
             <input type="hidden" name="userid" value="${userVO.userid}"/>
 
-            <table class="join_table">
+            <table class="table join_table">
                 <tbody>
                 <tr>
                     <th>아이디</th>
diff --git a/src/main/webapp/WEB-INF/jsp/map/userInfo.jsp b/src/main/webapp/WEB-INF/jsp/map/userInfo.jsp
index 79f4a90..29c46cc 100644
--- a/src/main/webapp/WEB-INF/jsp/map/userInfo.jsp
+++ b/src/main/webapp/WEB-INF/jsp/map/userInfo.jsp
@@ -3,113 +3,117 @@
 <%@ 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"%>
-
-	<form:form commandName="userVO" name="updateForm" action="/map/userUpdate" id="updateForm" method="post">
-		<input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}" />
-		<input type="hidden" name="userid" value="${userVO.userid}" />
-		<div class="section_content">
-			<div class="join_top">
-				<h2><span class="glyphicon glyphicon-edit"></span> 회원 정보 수정</h2>
-			</div>
-			<table class="join_table">
-				<tbody>
-					<tr>
-						<th>아이디</th>
-						<td>${userVO.userid}</td>
-					</tr>
-					<tr>
-						<th>비밀번호</th>
-						<td>
-							<p><label><input type="checkbox" id="changePw" /> 비밀번호 변경</<label></p>
-							<input type="password" class="form-control"  id="password" name="password" value="" disabled="true" />
-						</td>
-					</tr>
-					<tr>
-						<th>비밀번호 확인</th>
-						<td><input type="password" class="form-control" id="passwordCheck" name="passwordCheck" value="" disabled="true" />
-						</td>
-					</tr>
-					<tr>
-						<th>이름</th>
-						<td><input type="text" class="form-control"  name="name"  id="name" value="${userVO.name}" /></td>
-					</tr>
-					<tr>
-						<th>소속기관</th>
-						<td><input type="text" class="form-control" name="company"  id="company" value="${userVO.company}" /></td>
-					</tr>
-					<tr>
-						<th>연락처</th>
-						<td><input type="text" class="form-control" name="phonenum"  id="phonenum" value="${userVO.phonenum}"/></td>
-					</tr>
-					<tr>
-						<th>이메일</th>
-						<td>
-							<div>
-								<input type="text" class="form-control" name="email" id="email" value="${userVO.email}" />
-							</div>
-						</td>
-					</tr>
-				</tbody>
-			</table>
-			<div class="join_top" style="margin-top:20px;">
-				<p class="search_p2">
-					<input class="btn btn-success" type="button" value="수정" onclick="update();" />
-				</p>
-			</div>
-		</div>
-	</form:form>
+<style>
+  .section_content{
+    width: 620px;
+  }
+</style>
+<form:form commandName="userVO" name="updateForm" action="/map/userUpdate" id="updateForm" method="post">
+  <input type="hidden" name="${_csrf.parameterName}" value="${_csrf.token}" />
+  <input type="hidden" name="userid" value="${userVO.userid}" />
+  <div class="section_content ms-5">
+    <div class="join_top">
+      <h2><span class="glyphicon glyphicon-edit"></span> 회원 정보 수정</h2>
+    </div>
+    <table class="table join_table">
+      <tbody>
+      <tr>
+        <th>아이디</th>
+        <td>${userVO.userid}</td>
+      </tr>
+      <tr>
+        <th>비밀번호</th>
+        <td>
+          <p><label><input type="checkbox" id="changePw" /> 비밀번호 변경</label></p>
+          <input type="password" class="form-control"  id="password" name="password" value="" disabled="true" />
+        </td>
+      </tr>
+      <tr>
+        <th>비밀번호 확인</th>
+        <td><input type="password" class="form-control" id="passwordCheck" name="passwordCheck" value="" disabled="true" />
+        </td>
+      </tr>
+      <tr>
+        <th>이름</th>
+        <td><input type="text" class="form-control"  name="name"  id="name" value="${userVO.name}" /></td>
+      </tr>
+      <tr>
+        <th>소속기관</th>
+        <td><input type="text" class="form-control" name="company"  id="company" value="${userVO.company}" /></td>
+      </tr>
+      <tr>
+        <th>연락처</th>
+        <td><input type="text" class="form-control" name="phonenum"  id="phonenum" value="${userVO.phonenum}"/></td>
+      </tr>
+      <tr>
+        <th>이메일</th>
+        <td>
+          <div>
+            <input type="text" class="form-control" name="email" id="email" value="${userVO.email}" />
+          </div>
+        </td>
+      </tr>
+      </tbody>
+    </table>
+    <div class="join_top" style="margin-top:20px;">
+      <p class="search_p2">
+        <input class="btn btn-success" type="button" value="수정" onclick="update();" />
+      </p>
+    </div>
+  </div>
+</form:form>
 <script>
-	$(function(){
-		$("#changePw").click(function(){
-			if($(this).is(":checked")){
-				$("#password").attr("disabled", false);
-				$("#passwordCheck").attr("disabled", false);
-			}else{
-				$("#password").attr("disabled", true);
-				$("#passwordCheck").attr("disabled", true);
-			}
-		});
-	});
+  $(function(){
+    $("#changePw").click(function(){
+      if($(this).is(":checked")){
+        $("#password").attr("disabled", false);
+        $("#passwordCheck").attr("disabled", false);
+      }else{
+        $("#password").attr("disabled", true);
+        $("#passwordCheck").attr("disabled", true);
+      }
+    });
+  });
 
-	function update() {
-		var changePw = $("#changePw").is(":checked");
-		var pw1 = $('#password').val();
-		var pw2 = $('#passwordCheck').val();
-		var name = $('#name').val();
-		var company = $('#company').val();
-		var tell = $('#phonenum').val();
-		var email_1 = $('#email').val();
+  function update() {
+    var changePw = $("#changePw").is(":checked");
+    var pw1 = $('#password').val();
+    var pw2 = $('#passwordCheck').val();
+    var name = $('#name').val();
+    var company = $('#company').val();
+    var tell = $('#phonenum').val();
+    var email_1 = $('#email').val();
 
-		if (changePw && pw1 == "") {
-			alert('비밀번호를 입력해주세요');
-			$('#password').focus();
-			return;
-		} else if (changePw && pw2 == "") {
-			alert('비밀번호를 입력해주세요');
-			$('#passwordCheck').focus();
-			return;
-		} else if (changePw && (pw1 != pw2)) {
-			alert('비밀번호가 일치하지 않습니다.');
-			$('#pass').focus();
-			return;
-		} else if (name == "") {
-			alert('이름을 입력해주세요');
-			$('#name').focus();
-			return;
-		} else if (company == "") {
-			alert('소속기관을 입력해주세요');
-			$('#company').focus();
-			return;
-		} else if (tell == "") {
-			alert('연락처를 입력해주세요');
-			$('#phone_num').focus();
-			return;
-		} else if (email_1 == "") {
-			alert('이메일을 입력해주세요');
-			$('#email').focus();
-			return;
-		} else {
-			$("#updateForm").submit();
-		}
-	}
+    if (changePw && pw1 == "") {
+      alert('비밀번호를 입력해주세요');
+      $('#password').focus();
+      return;
+    } else if (changePw && pw2 == "") {
+      alert('비밀번호를 입력해주세요');
+      $('#passwordCheck').focus();
+      return;
+    } else if (changePw && (pw1 != pw2)) {
+      alert('비밀번호가 일치하지 않습니다.');
+      $('#pass').focus();
+      return;
+    } else if (name == "") {
+      alert('이름을 입력해주세요');
+      $('#name').focus();
+      return;
+    } else if (company == "") {
+      alert('소속기관을 입력해주세요');
+      $('#company').focus();
+      return;
+    } else if (tell == "") {
+      alert('연락처를 입력해주세요');
+      $('#phone_num').focus();
+      return;
+    } else if (email_1 == "") {
+      alert('이메일을 입력해주세요');
+      $('#email').focus();
+      return;
+    } else {
+      $("#updateForm").submit();
+    }
+  }
 </script>
diff --git a/src/main/webapp/js/admin/fieldData.js b/src/main/webapp/js/admin/fieldData.js
index f2076e9..cef132b 100644
--- a/src/main/webapp/js/admin/fieldData.js
+++ b/src/main/webapp/js/admin/fieldData.js
@@ -58,7 +58,7 @@ $(document).on("click", ".statusTab", function () {
 
 function fn_link_page(pageNo) {
     document.searchForm.pageIndex.value = pageNo;
-    document.searchForm.action = "<c:url value='/admin/fieldData' />";
+    document.searchForm.action = "/admin/fieldData";
     document.searchForm.submit();
 }
 
diff --git a/src/main/webapp/js/admin/userinfo.js b/src/main/webapp/js/admin/userinfo.js
index 02fb520..a91be0c 100644
--- a/src/main/webapp/js/admin/userinfo.js
+++ b/src/main/webapp/js/admin/userinfo.js
@@ -21,7 +21,7 @@ $(document).on('click', '.userInfoModalBtn', function () {
 
 function fn_link_page(pageNo) {
     document.searchForm.pageIndex.value = pageNo;
-    document.searchForm.action = "<c:url value='/admin/userInfo' />";
+    document.searchForm.action = "/admin/userInfo";
     document.searchForm.submit();
 }