From dbbf21bb55af1da68ba695ac355e205cb4ba7612 Mon Sep 17 00:00:00 2001
From: leebeomjun <leebj91@xit.co.kr>
Date: Mon, 3 Apr 2023 10:30:45 +0900
Subject: [PATCH] =?UTF-8?q?fix=20:=20=EB=A6=AC=EC=86=8C=EC=8A=A4=20?=
 =?UTF-8?q?=EA=B2=BD=EB=A1=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/jsp/framework/frameworkIncludeBase.jsp  |   8 ++++++++
 .../layouts/tiles/biz/cmmn/BizIncludeBase.jsp       |   6 ------
 .../webapp/WEB-INF/templates/layout/cmm_script.html |   2 +-
 .../webapp/WEB-INF/templates/layout/cmm_style.html  |   2 +-
 .../framework/{ => libs}/datepicker/datepicker.css  |   0
 .../framework/{ => libs}/datepicker/datepicker.js   |   0
 .../{ => libs}/datepicker/images/arrow-button.png   | Bin
 .../datepicker/images/ui-icons_444444_256x240.png   | Bin
 .../datepicker/images/ui-icons_555555_256x240.png   | Bin
 .../datepicker/images/ui-icons_777620_256x240.png   | Bin
 .../datepicker/images/ui-icons_777777_256x240.png   | Bin
 .../datepicker/images/ui-icons_cc0000_256x240.png   | Bin
 .../datepicker/images/ui-icons_ffffff_256x240.png   | Bin
 13 files changed, 10 insertions(+), 8 deletions(-)
 rename src/main/webapp/resources/framework/{ => libs}/datepicker/datepicker.css (100%)
 rename src/main/webapp/resources/framework/{ => libs}/datepicker/datepicker.js (100%)
 rename src/main/webapp/resources/framework/{ => libs}/datepicker/images/arrow-button.png (100%)
 rename src/main/webapp/resources/framework/{ => libs}/datepicker/images/ui-icons_444444_256x240.png (100%)
 rename src/main/webapp/resources/framework/{ => libs}/datepicker/images/ui-icons_555555_256x240.png (100%)
 rename src/main/webapp/resources/framework/{ => libs}/datepicker/images/ui-icons_777620_256x240.png (100%)
 rename src/main/webapp/resources/framework/{ => libs}/datepicker/images/ui-icons_777777_256x240.png (100%)
 rename src/main/webapp/resources/framework/{ => libs}/datepicker/images/ui-icons_cc0000_256x240.png (100%)
 rename src/main/webapp/resources/framework/{ => libs}/datepicker/images/ui-icons_ffffff_256x240.png (100%)

diff --git a/src/main/webapp/WEB-INF/jsp/framework/frameworkIncludeBase.jsp b/src/main/webapp/WEB-INF/jsp/framework/frameworkIncludeBase.jsp
index 21f90637..959c972c 100644
--- a/src/main/webapp/WEB-INF/jsp/framework/frameworkIncludeBase.jsp
+++ b/src/main/webapp/WEB-INF/jsp/framework/frameworkIncludeBase.jsp
@@ -78,6 +78,14 @@
 <!-- 블록ui -->
 <script type="text/javascript" src="${ctx}/resources/3rd-party/sneat/libs/block-ui/block-ui.js"></script>
 
+<!-- [JS/CSS] jquery ui -->
+<link rel="stylesheet" type="text/css" href="${ctx}/resources/3rd-party/jquery-ui/1.13.2/themes/redmond/jquery-ui.css" />
+<script type="text/javascript" src="${ctx}/resources/3rd-party/jquery-ui/1.13.2/jquery-ui.js" ></script>
+
+<!-- jquery datepicker custom -->
+<link rel="stylesheet" type="text/css" href="${ctx}/resources/framework/libs/datepicker/datepicker.css" />
+<script type="text/javascript" src="${ctx}/resources/framework/libs/datepicker/datepicker.js" ></script>
+
 <%--TODO:  보완 필요 : 공통 ajax 호출 모듈과 통합 필요  --%>
 <script type="text/javascript">
     var XitIncludeBase = {
diff --git a/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/cmmn/BizIncludeBase.jsp b/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/cmmn/BizIncludeBase.jsp
index 1682e292..ac456d5b 100644
--- a/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/cmmn/BizIncludeBase.jsp
+++ b/src/main/webapp/WEB-INF/jsp/framework/layouts/tiles/biz/cmmn/BizIncludeBase.jsp
@@ -10,13 +10,7 @@
 
 	<link rel="stylesheet" type="text/css" href="${ctx}/resources/framework/css/cmmn/common-style.css"/>
 
-	<!-- [JS/CSS] jquery ui -->
-	<link rel="stylesheet" type="text/css" href="${ctx}/resources/3rd-party/jquery-ui/1.13.2/themes/redmond/jquery-ui.css" />
-	<script type="text/javascript" src="${ctx}/resources/3rd-party/jquery-ui/1.13.2/jquery-ui.js" ></script>
 
-	<!-- jquery datepicker custom -->
-	<link rel="stylesheet" type="text/css" href="${ctx}/resources/framework/datepicker/datepicker.css" />
-	<script type="text/javascript" src="${ctx}/resources/framework/datepicker/datepicker.js" ></script>
 
 
 	<!-- [JS/CSS] tui Grid -->
diff --git a/src/main/webapp/WEB-INF/templates/layout/cmm_script.html b/src/main/webapp/WEB-INF/templates/layout/cmm_script.html
index bcca33c8..b3c40977 100644
--- a/src/main/webapp/WEB-INF/templates/layout/cmm_script.html
+++ b/src/main/webapp/WEB-INF/templates/layout/cmm_script.html
@@ -7,7 +7,7 @@
       <script defer type="text/javascript" src="/resources/3rd-party/sneat/js/helpers.js"></script>
       <script defer type="text/javascript" src="/resources/3rd-party/jquery-ui/1.13.2/jquery-ui.js" ></script>
       <script defer type="text/javascript" src="/resources/biz/common/js/jquery.serializeObject.js" ></script>
-      <script defer type="text/javascript" src="/resources/framework/datepicker/datepicker.js" ></script>
+      <script defer type="text/javascript" src="/resources/framework/libs/datepicker/datepicker.js" ></script>
       <script defer type="text/javascript" src="/resources/3rd-party/rolling/js/jquery.vticker-min.js"></script>
 
         <!-- [JS/CSS] tui Grid -->
diff --git a/src/main/webapp/WEB-INF/templates/layout/cmm_style.html b/src/main/webapp/WEB-INF/templates/layout/cmm_style.html
index dabeec62..502907b8 100644
--- a/src/main/webapp/WEB-INF/templates/layout/cmm_style.html
+++ b/src/main/webapp/WEB-INF/templates/layout/cmm_style.html
@@ -20,7 +20,7 @@
     <link rel="stylesheet" type="text/css" href="/resources/biz/common/css/index.css"/>
     <link rel="stylesheet" type="text/css" href="/resources/framework/css/cmmn/common-style.css"/>
     <link rel="stylesheet" type="text/css" href="/resources/3rd-party/jquery-ui/1.13.2/themes/redmond/jquery-ui.css" />
-    <link rel="stylesheet" type="text/css" href="/resources/framework/datepicker/datepicker.css" />
+    <link rel="stylesheet" type="text/css" href="/resources/framework/libs/datepicker/datepicker.css" />
     <link rel="stylesheet" type="text/css" href="/resources/3rd-party/tui/grid/4.21.5/tui-pagination/tui-pagination.css" />
     <link rel="stylesheet" type="text/css" href="/resources/3rd-party/tui/grid/4.21.5/tui-grid/tui-grid.css" />
     <link rel="stylesheet" type="text/css" href="/resources/framework/css/cmmn/xit-tui-grid.css" />
diff --git a/src/main/webapp/resources/framework/datepicker/datepicker.css b/src/main/webapp/resources/framework/libs/datepicker/datepicker.css
similarity index 100%
rename from src/main/webapp/resources/framework/datepicker/datepicker.css
rename to src/main/webapp/resources/framework/libs/datepicker/datepicker.css
diff --git a/src/main/webapp/resources/framework/datepicker/datepicker.js b/src/main/webapp/resources/framework/libs/datepicker/datepicker.js
similarity index 100%
rename from src/main/webapp/resources/framework/datepicker/datepicker.js
rename to src/main/webapp/resources/framework/libs/datepicker/datepicker.js
diff --git a/src/main/webapp/resources/framework/datepicker/images/arrow-button.png b/src/main/webapp/resources/framework/libs/datepicker/images/arrow-button.png
similarity index 100%
rename from src/main/webapp/resources/framework/datepicker/images/arrow-button.png
rename to src/main/webapp/resources/framework/libs/datepicker/images/arrow-button.png
diff --git a/src/main/webapp/resources/framework/datepicker/images/ui-icons_444444_256x240.png b/src/main/webapp/resources/framework/libs/datepicker/images/ui-icons_444444_256x240.png
similarity index 100%
rename from src/main/webapp/resources/framework/datepicker/images/ui-icons_444444_256x240.png
rename to src/main/webapp/resources/framework/libs/datepicker/images/ui-icons_444444_256x240.png
diff --git a/src/main/webapp/resources/framework/datepicker/images/ui-icons_555555_256x240.png b/src/main/webapp/resources/framework/libs/datepicker/images/ui-icons_555555_256x240.png
similarity index 100%
rename from src/main/webapp/resources/framework/datepicker/images/ui-icons_555555_256x240.png
rename to src/main/webapp/resources/framework/libs/datepicker/images/ui-icons_555555_256x240.png
diff --git a/src/main/webapp/resources/framework/datepicker/images/ui-icons_777620_256x240.png b/src/main/webapp/resources/framework/libs/datepicker/images/ui-icons_777620_256x240.png
similarity index 100%
rename from src/main/webapp/resources/framework/datepicker/images/ui-icons_777620_256x240.png
rename to src/main/webapp/resources/framework/libs/datepicker/images/ui-icons_777620_256x240.png
diff --git a/src/main/webapp/resources/framework/datepicker/images/ui-icons_777777_256x240.png b/src/main/webapp/resources/framework/libs/datepicker/images/ui-icons_777777_256x240.png
similarity index 100%
rename from src/main/webapp/resources/framework/datepicker/images/ui-icons_777777_256x240.png
rename to src/main/webapp/resources/framework/libs/datepicker/images/ui-icons_777777_256x240.png
diff --git a/src/main/webapp/resources/framework/datepicker/images/ui-icons_cc0000_256x240.png b/src/main/webapp/resources/framework/libs/datepicker/images/ui-icons_cc0000_256x240.png
similarity index 100%
rename from src/main/webapp/resources/framework/datepicker/images/ui-icons_cc0000_256x240.png
rename to src/main/webapp/resources/framework/libs/datepicker/images/ui-icons_cc0000_256x240.png
diff --git a/src/main/webapp/resources/framework/datepicker/images/ui-icons_ffffff_256x240.png b/src/main/webapp/resources/framework/libs/datepicker/images/ui-icons_ffffff_256x240.png
similarity index 100%
rename from src/main/webapp/resources/framework/datepicker/images/ui-icons_ffffff_256x240.png
rename to src/main/webapp/resources/framework/libs/datepicker/images/ui-icons_ffffff_256x240.png