From cfe0d3c263b8630589fbdb9abdb477abf3df5dcb Mon Sep 17 00:00:00 2001
From: minuk926 <minuk926@gmail.com>
Date: Fri, 28 Oct 2022 20:12:17 +0900
Subject: [PATCH] =?UTF-8?q?fix:=20javascript=20=EA=B5=AC=EC=A1=B0=20?=
 =?UTF-8?q?=ED=99=95=EC=A0=95=20=EB=B0=98=EC=98=81?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../biz/mng/usr/mngUserRegMgtForm.jsp         |  3 +-
 .../framework/layouts/tiles/biz/footer.jsp    |  3 +-
 .../framework/layouts/tiles/biz/header.jsp    | 99 +++++++++----------
 .../tiles/biz/layout-tiles-biz-main.jsp       | 15 +--
 .../tiles/biz/layout-tiles-biz-pop.jsp        | 34 +++----
 .../layouts/tiles/biz/layout-tiles-biz.jsp    | 45 +++------
 .../webapp/WEB-INF/jsp/framework/taglibs.jsp  | 11 ++-
 7 files changed, 84 insertions(+), 126 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/usr/mngUserRegMgtForm.jsp b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/usr/mngUserRegMgtForm.jsp
index 293e789d..6f6e19da 100644
--- a/src/main/webapp/WEB-INF/jsp/framework/biz/mng/usr/mngUserRegMgtForm.jsp
+++ b/src/main/webapp/WEB-INF/jsp/framework/biz/mng/usr/mngUserRegMgtForm.jsp
@@ -1,14 +1,13 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@ include file="/WEB-INF/jsp/framework/taglibs.jsp"%>
 
-
 <form name="frmSearch" id="frmSearch" method="post">
 	<input type="hidden" id="searchAt" name="searchAt" value="Y">
 	<input name="selectedId" type="hidden" />
 	<input type="hidden" id="searchGubun" name="searchGubun" value="excel">
 	<input name="pageIndex" type="hidden" value="<c:out value='${userSearchVO.pageIndex}'/>"/>
 	<input type="hidden" name="checkedIdForDel" id="checkedIdForDel">
-	<div class="search r2">
+	<div class="search">
 
 		<table>
 			<caption>검색조건</caption>
diff --git a/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/footer.jsp b/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/footer.jsp
index 787c3a69..35105be0 100644
--- a/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/footer.jsp
+++ b/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/footer.jsp
@@ -1,6 +1,5 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 
-
 <footer>
     <div class="link-box">
         <a href=#none>필요한 주소1</a> | 
@@ -8,4 +7,4 @@
         <a href=#none>필요한 주소3</a>
     </div>
     COPYRIGHT 2021 BY COMPANY NAME CO.LTD. ALL RIGHTS RESERVED.
-</footer>
\ No newline at end of file
+</footer>
diff --git a/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/header.jsp b/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/header.jsp
index 18f880f4..6d89e962 100644
--- a/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/header.jsp
+++ b/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/header.jsp
@@ -1,58 +1,9 @@
 <%@ 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="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
+<%@ taglib prefix="sec"     uri="http://www.springframework.org/security/tags"%>
 <%String uri = request.getRequestURI();%>
 
-
-
-<script type="text/javascript">
-
-
-/* 사용자 수정 화면*/
-function fn_goMyView() {
-	/* ====================
-	* 2020.11.20 박민규
-	* 회원 유형별 페이지 분기
-	====================*/
-	//2020.11.20. 주석처리
-//		var popUrl ='<c:url value="/framework/biz/mng/usr/UserRegMng_view.do"/>';
-//		var popOption = "width=1100px, height=600px, resizable=no, scrollbars=no, location=no, top=100px, left=100px";
-	var popUrl ='';
-	var popOption = '';
-    if('GNR'=='${sessionScope.XitLoginSession.userSe}'){
-		popUrl ='<c:url value="/framework/biz/mng/usr/GnrUserRegMng_view.do"/>';
-    	popOption = "width=738px, height=630px, resizable=no, scrollbars=no, location=no, top=100px, left=100px";
-    }
-    else if('ENT'=='${sessionScope.XitLoginSession.userSe}'){
-		popUrl ='<c:url value="/framework/biz/mng/usr/EntUserRegMng_view.do"/>';
-	    popOption = "width=738px, height=777px, resizable=no, scrollbars=no, location=no, top=100px, left=100px";
-    }
-    else{
-		popUrl ='<c:url value="/framework/biz/mng/usr/UserRegMng_view.do"/>';
-		popOption = "width=1100px, height=600px, resizable=no, scrollbars=no, location=no, top=100px, left=100px";
-    }
-
-    var target = '정보수정';
-	window.open('',target,popOption);
-	var param = new Object();
-	param.selectedId = '${sessionScope.XitLoginSession.uniqId}';
-	param.tilesDef = 'popup';
-    var form = XitCmmnUtil.createForm(param);
-		form.action = popUrl;
-		form.method = 'post';
-		form.target = target;
-		form.id     = 'frmPost';
-	document.body.appendChild(form);
-	form.submit();
-}
-
-</script>
-
-
-
-
-
-
 <header>
     <hgroup>
     
@@ -61,8 +12,7 @@ function fn_goMyView() {
 	        	<img src="<c:url value='/'/>resources/images/login/mainLogo_02.png" alt="Logo Image" style="margin-top:10px;"/>
 	        </a>
 	    </div> 
-	     
-	     
+
 	     <div class="mobileLogo">
 	    	 <a href="${ctx }/login/actionMain.do" class="logo">
 	        	<img src="<c:url value='/'/>resources/images/login/mobileLogo.png" alt="Logo Image"/>
@@ -78,7 +28,7 @@ function fn_goMyView() {
                 <div class="infoArea">
                     <span class="faceArea"><img src="${ctx}/resources/biz/common/images/common/etc/sampleFace.jpg" alt="<c:out value="${sessionScope.XitLoginSession.name }" />"></span>
                     <div class="txtArea">
-                        <strong><c:out value="${sessionScope.XitLoginSession.name }" /></strong>
+                        <strong><c:out value="${sessionScope.XitLoginSession.name }" />[<sec:authentication property="principal.Username"/>]</strong>
                         <em><c:out value="${sessionScope.XitLoginSession.orgnztNm }" /></em>
                         <ul class="btnArea">
                             <li><a href="${ctx }/login/actionLogout.do" id="logout_btn">로그아웃</a></li>
@@ -147,10 +97,49 @@ function fn_goMyView() {
 		                    </li>
                 		</c:if>
                 	</c:forEach>
-                
                 </ul>
             </nav>
         </div>
-        
     </hgroup>
 </header>
+
+<script type="text/javascript">
+
+	/* 사용자 수정 화면*/
+	function fn_goMyView() {
+		/* ====================
+		* 2020.11.20 박민규
+		* 회원 유형별 페이지 분기
+		====================*/
+		//2020.11.20. 주석처리
+		//		var popUrl ='<c:url value="/framework/biz/mng/usr/UserRegMng_view.do"/>';
+		//		var popOption = "width=1100px, height=600px, resizable=no, scrollbars=no, location=no, top=100px, left=100px";
+		let popUrl ='';
+		let popOption = '';
+		if('GNR'=='${sessionScope.XitLoginSession.userSe}'){
+			popUrl ='<c:url value="/framework/biz/mng/usr/GnrUserRegMng_view.do"/>';
+			popOption = {width: 738, height: 630};
+		}
+		else if('ENT'=='${sessionScope.XitLoginSession.userSe}'){
+			popUrl ='<c:url value="/framework/biz/mng/usr/EntUserRegMng_view.do"/>';
+			popOption = {width: 738, height: 777};
+		}
+		else{
+			popUrl ='<c:url value="/framework/biz/mng/usr/UserRegMng_view.do"/>';
+			popOption = {width: 1100, height: 600};
+		}
+
+		const target = '정보수정';
+		CmmPopup.open(popUrl, {}, popOption, target);
+		const param = new Object();
+		param.selectedId = '${sessionScope.XitLoginSession.uniqId}';
+		param.tilesDef = 'popup';
+		const form = XitCmmnUtil.createForm(param);
+		form.action = popUrl;
+		form.method = 'post';
+		form.target = target;
+		form.id     = 'frmPost';
+		document.body.appendChild(form);
+		form.submit();
+	}
+</script>
diff --git a/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/layout-tiles-biz-main.jsp b/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/layout-tiles-biz-main.jsp
index 2a65a35a..5832c14a 100644
--- a/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/layout-tiles-biz-main.jsp
+++ b/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/layout-tiles-biz-main.jsp
@@ -1,15 +1,6 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@ taglib prefix="t" uri="http://tiles.apache.org/tags-tiles" %>
 <%@ taglib prefix="c"    uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fn"   uri="http://java.sun.com/jsp/jstl/functions" %>
-<%@ taglib prefix="fmt"  uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
-<%@ taglib prefix="form"   uri="http://www.springframework.org/tags/form" %>
-<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
-
-
-
-
 
 <!DOCTYPE html>
 <html>
@@ -17,8 +8,8 @@
 	<%@include file="/WEB-INF/jsp/framework/layouts/tiles/biz/cmmn/BizIncludeBase.jsp" %>
 </head>
 
-<!-- <body> -->
-<body>
+    <!-- <body> -->
+    <body>
 	
         <div id="skipnavigation">
             <ul>
@@ -50,6 +41,6 @@
                 
         </div>
 
-</body>
+    </body>
 </html>
 
diff --git a/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/layout-tiles-biz-pop.jsp b/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/layout-tiles-biz-pop.jsp
index b25dbd3c..570f18c3 100644
--- a/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/layout-tiles-biz-pop.jsp
+++ b/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/layout-tiles-biz-pop.jsp
@@ -1,20 +1,12 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@ taglib prefix="t" uri="http://tiles.apache.org/tags-tiles" %>
 <%@ taglib prefix="c"    uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fn"   uri="http://java.sun.com/jsp/jstl/functions" %>
-<%@ taglib prefix="fmt"  uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
-<%@ taglib prefix="form"   uri="http://www.springframework.org/tags/form" %>
-<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
-
-
-
 
 <!DOCTYPE html>
 <html>
 <head>
 	<%@include file="/WEB-INF/jsp/framework/layouts/tiles/biz/cmmn/BizIncludeBase.jsp" %>
-	<style type="text/css">
+	<style>
 		#wrap {
 			padding: 5px 20px 5px 20px;
 		}
@@ -22,17 +14,17 @@
 </head>
 
 <!-- <body> -->
-<body>
-	
-	<div id="wrap">
-<%-- 	<div class="conttitle">
-		<img src="${ctx }/resources/biz/content/images/common/main/titleLogo_01.png"/>
-		<h3>${urlInfoMap.menuName}</h3>
-	</div><!--2021.09.23 박소영 h3새로추가--> --%>
-		<t:insertAttribute name="content"/>        
-	</div>
-	<!-- //wrap -->
-	
-</body>
+	<body>
+
+		<div id="wrap">
+	<%-- 	<div class="conttitle">
+			<img src="${ctx }/resources/biz/content/images/common/main/titleLogo_01.png"/>
+			<h3>${urlInfoMap.menuName}</h3>
+		</div><!--2021.09.23 박소영 h3새로추가--> --%>
+			<t:insertAttribute name="content"/>
+		</div>
+		<!-- //wrap -->
+
+	</body>
 </html>
 
diff --git a/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/layout-tiles-biz.jsp b/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/layout-tiles-biz.jsp
index 95abc0c5..befd4266 100644
--- a/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/layout-tiles-biz.jsp
+++ b/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/layout-tiles-biz.jsp
@@ -1,25 +1,16 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@ taglib prefix="t" uri="http://tiles.apache.org/tags-tiles" %>
-<%@ taglib prefix="c"    uri="http://java.sun.com/jsp/jstl/core" %>
-<%@ taglib prefix="fn"   uri="http://java.sun.com/jsp/jstl/functions" %>
-<%@ taglib prefix="fmt"  uri="http://java.sun.com/jsp/jstl/fmt" %>
-<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
-<%@ taglib prefix="form"   uri="http://www.springframework.org/tags/form" %>
-<%@ taglib prefix="ui" uri="http://egovframework.gov/ctl/ui"%>
-
-
-
-
+<%@ taglib prefix="c"       uri="http://java.sun.com/jsp/jstl/core" %>
 
 <!DOCTYPE html>
 <html>
-<head>
-	<%@include file="/WEB-INF/jsp/framework/layouts/tiles/biz/cmmn/BizIncludeBase.jsp" %>
-</head>
+    <head>
+        <%@include file="/WEB-INF/jsp/framework/layouts/tiles/biz/cmmn/BizIncludeBase.jsp" %>
+    </head>
+
+    <!-- <body> -->
+    <body>
 
-<!-- <body> -->
-<body>
-	
         <div id="skipnavigation">
             <ul>
                 <li><a href="#content-box">본문 바로가기</a></li>
@@ -29,33 +20,29 @@
         <!-- //skipnavigation -->
         <div id="wrap">
             <div class="bind-contents">
-            	<t:insertAttribute name="header"/>
-            
+                <t:insertAttribute name="header"/>
+
                 <div class="cont main">
                     <div class="cont_container">
-                        <article class="main" id="content-box">	
+                        <article class="main" id="content-box">
                             <p class="history"><%@include file="/WEB-INF/jsp/framework/layouts/tiles/biz/cmmn/BizIncludeMenuPath.jsp" %></p>
                             <div class="conttitle">
-                            	<img src="${ctx }/resources/biz/content/images/common/main/titleLogo_01.png"/>
-                            	<%-- <h3>${urlInfoMap.menuName}</h3> --%>
-                            	<p class="title">${urlInfoMap.menuName}</p>
+                                <img src="${ctx }/resources/biz/content/images/common/main/titleLogo_01.png"/>
+                                <%-- <h3>${urlInfoMap.menuName}</h3> --%>
+                                <p class="title">${urlInfoMap.menuName}</p>
                             </div>
-							<t:insertAttribute name="content"/>                        		
+                            <t:insertAttribute name="content"/>
                         </article>
                     </div>
                 </div>
                 <!-- //cont main -->
             </div>
             <!-- //bind-contents -->
-            
-            
+
             <t:insertAttribute name="footer"/>
         </div>
         <!-- //wrap -->
-<!--         <div class="modal-wrap"> -->
-                
-<!--         </div> -->
+    </body>
 
-</body>
 </html>
 
diff --git a/src/main/webapp/WEB-INF/jsp/framework/taglibs.jsp b/src/main/webapp/WEB-INF/jsp/framework/taglibs.jsp
index 8e2ebc19..726f7cd5 100644
--- a/src/main/webapp/WEB-INF/jsp/framework/taglibs.jsp
+++ b/src/main/webapp/WEB-INF/jsp/framework/taglibs.jsp
@@ -1,13 +1,14 @@
 <%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 
-<%@ taglib prefix="spring"  uri="http://www.springframework.org/tags"%>
-<%@ taglib prefix="sec"     uri="http://www.springframework.org/security/tags"%>
+<%-- TODO: comment 처리한 JSTL은 필요한 JSP 페이지에서 경우 각각 import --%>
+<!-- comment 처리한 JSTL은 필요한 경우 각각 import-->
+<%--@ taglib prefix="spring"  uri="http://www.springframework.org/tags"--%>
+<%--@ taglib prefix="sec"     uri="http://www.springframework.org/security/tags"--%>
 <%@ taglib prefix="form"    uri="http://www.springframework.org/tags/form" %>
-
 <%@ taglib prefix="c"       uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="fmt"     uri="http://java.sun.com/jsp/jstl/fmt"%>
-<%@ taglib prefix="ui"      uri="http://egovframework.gov/ctl/ui"%>
+<%--@ taglib prefix="ui"      uri="http://egovframework.gov/ctl/ui"--%>
 <%@ taglib prefix="fn"      uri="http://java.sun.com/jsp/jstl/functions"%>
-<%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %>
+<%--@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" --%>
 
 <%@ taglib prefix="code"    uri="/WEB-INF/tlds/code.tld"%>