비밀번호변경 수정

style24.admin/src/main/webapp/WEB-INF/views/common/fragments/gnb.html

@@ -43,7 +43,7 @@
 			<i class="dot">&bull;</i>
 			<a th:text="${sessionInfo.roleNm}">Director</a>
 			<i class="dot">&bull;</i>
-			<a th:onclick="|cfnPasswordChange();|">비밀번호 변경</a>
+			<a href="#" th:onclick="|fnOpenPasswordChangePopup();|">비밀번호 변경</a>
 			<i class="dot">&bull;</i>
 			<a href="#" th:href="@{/logout}">Log out</a>
 		</div>
@@ -82,6 +82,11 @@
 		cfnDrawLnbMenu($(a).data('menuId'));
 	});
 	
+	// 비밀번호 변경 팝업
+	var fnOpenPasswordChangePopup = function() {
+		cfnOpenModalPopup('/system/password/change/form', 'popupPasswordChange');
+	}
+	
 	$(document.body).ready(function() {
 		// 로그인메뉴목록 설정
 		cfnSetLoginMenuList([[${loginMenuList}]]);

style24.admin/src/main/webapp/WEB-INF/views/system/PopupPasswordChangeForm.html → style24.admin/src/main/webapp/WEB-INF/views/system/PasswordChangeForm.html

@@ -3,44 +3,51 @@
 	xmlns:th="http://www.thymeleaf.org">
 <!--
  *******************************************************************************
- * @source  : PopupPasswordChangeForm.html
- * @desc    : 비밀번호 변경 팝업
+ * @source  : PasswordChangeForm.html
+ * @desc    : 비밀번호 변경 팝업 Page
  *============================================================================
- * SISUN
- * Copyright(C) 2019 TSIT, All rights reserved.
+ * STYLE24
+ * Copyright(C) 2020 TSIT, All rights reserved.
  *============================================================================
  * VER  DATE         AUTHOR      DESCRIPTION
  * ===  ===========  ==========  =============================================
- * 1.0  2020.01.16   rladbwnd5   최초 작성
+ * 1.0  2020.10.30   gagamel     최초 작성
  *******************************************************************************
  -->
-	<ul class="popup modal" data-width="500" >
-		<li class="mdPopTitle">
+<div class="modalPopup" data-width="500" id="popupPasswordChange">
+	<div class="panelStyle">
+		<!-- TITLE -->
+		<div class="panelTitle">
 			<strong>비밀번호 변경</strong>
-			<button type="button" class="close" onclick="uifnPopupClose('popupPassword')"><i class="fa fa-times"></i></button>
-		</li>
-		<li class="mdPopContent">
+			<button type="button" class="close" onclick="uifnPopupClose('popupPasswordChange');"><em class="fa fa-times"></em></button>
+		</div>
+		<!-- //TITLE -->
+		
+		<!-- CONTENT -->
+		<div class="panelContent">
 			<form name="popupPasswordForm" id="popupPasswordForm" action="#" th:action="@{'/system/user/password/change'}" th:method="post">
-				<input type="hidden" name="userId" th:value="${userId}"/>
-				<table class="frmStyle" aria-describedby="수정">
+				<input type="hidden" name="userNo" th:value="${sessionInfo.userNo}"/>
+				
+				<table class="frmStyle" aria-describedby="변경폼">
 					<colgroup>
 						<col style="width:10%;"/>
+						<col/>
 					</colgroup>
 					<tbody>
 						<tr>
-							<th class="dashR">관리자ID<i class="star" aria-hidden="true"></i></th>
-							<td class="dashR" th:text="${userId}">
+							<th>사용자ID<em class="required" title="필수"></em></th>
+							<td th:text="${sessionInfo.userId}">
 							</td>
 						</tr>
 						<tr>
-							<th class="dashR">비밀번호<i class="star" aria-hidden="true"></i></th>
-							<td class="dashR">
+							<th>비밀번호<em class="required" title="필수"></em></th>
+							<td>
 								<input type="password" class="w300" name="passwd" data-valid-type="password" required="required" data-valid-name="비밀번호"/>
 							</td>
 						</tr>
 						<tr>
-							<th class="dashR">비밀번호 확인<i class="star" aria-hidden="true"></i></th>
-							<td class="dashR">
+							<th>비밀번호 확인<em class="required" title="필수"></em></th>
+							<td>
 								<input type="password" class="w300" name="passwdConfirm" data-valid-type="password" required="required" data-valid-name="비밀번호 확인"/>
 							</td>
 						</tr>
@@ -49,18 +56,23 @@
 				<p class="dot cBlue">대문자, 소문자, 특수문자, 숫자로 구성해야 합니다.</p>
 				<p class="dot cBlue">이 중 3개 이상은 8 ~ 20자, 2개 이상은 10 ~ 20자로 설정해야 합니다.</p>
 			</form>
-		</li>
-		<li class="boxContentBtnB">
-			<button type="button" class="btn btn-success btn-lg " id="btnPasswordChange">저장</button>
-		</li>
-	</ul>
+		</div>
+		<!-- //CONTENT -->
+		
+		<!-- 버튼 배치 영역 -->
+		<ul class="panelBar">
+			<li class="right">
+				<button type="button" class="btn btn-info btn-lg" id="btnPasswordChange">저장</button>
+			</li>
+		</ul>
+		<!-- //버튼 배치 영역 -->
+	</div>
+</div>
 
 <script th:inline="javascript">
 /*<![CDATA[*/
 	$('#btnPasswordChange').on('click', function() {
-		var formId = '#popupPasswordForm';
-		
-		if (!gagajf.validation(formId))
+		if (!gagajf.validation('#popupPasswordForm'))
 			return false;
 		
 		var pwd = $('#popupPasswordForm input[name="passwd"]').val();
@@ -71,12 +83,12 @@
 			return;
 		}
 		
-		mcxDialog.confirm("비밀번호를 변경 하시겠습니까?", {
+		mcxDialog.confirm("비밀번호를 변경하시겠습니까?", {
 			cancelBtnText: "취소",
 			sureBtnText: "확인",
 			sureBtnClick: function() {
-				gagajf.ajaxFormSubmit($(formId).prop('action'), formId, function() {
-					uifnPopupClose('popupPassword');
+				gagajf.ajaxFormSubmit($('#popupPasswordForm').prop('action'), '#popupPasswordForm', function() {
+					uifnPopupClose('popupPasswordChange');
 				});
 			}
 		});

style24.admin/src/main/webapp/ux/js/admin.popup.js

@@ -268,22 +268,6 @@ var cfnOpenReviewDetailPopup = function(reviewSq) {
 
 }
 
-/**
- * @type   : function
- * @access : public
- * @desc   : 비밀번호 변경 팝업
- * <pre>
- *     cfnPasswordChange();
- * </pre>
- * @param  : actionUrl - 로딩 URL
- * @since  : 2020/01/16
- * @author : rladbwnd5
- */
-var cfnPasswordChange = function() {
-	var actionUrl = "/system/popup/password/change/form";
-	cfnOpenModalPopup(actionUrl,'popupPassword');
-}
-
 /**
  * @type   : function
  * @access : public