From 7ce14453e1cb3a7c47ee678caca3cebc90bfb853 Mon Sep 17 00:00:00 2001
From: KNKIM <knkim@digitalship.co.kr>
Date: Mon, 6 Dec 2021 10:30:21 +0900
Subject: [PATCH 1/2] =?UTF-8?q?=EB=AC=B8=EA=B5=AC=20=EC=99=B8=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95=20=EC=9E=91=EC=97=85=20(=EC=9A=94=EC=B2=AD=20:=20?=
 =?UTF-8?q?=EA=B9=80=ED=98=9C=EC=A4=80=20=EB=8C=80=EB=A6=AC)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../WEB-INF/jsp/nlib/read/confirmRead.jsp       |  2 +-
 .../WEB-INF/jsp/nlib/read/listReadItems.jsp     |  9 +++++----
 .../WEB-INF/jsp/nlib/rent/insertRentItems.jsp   |  6 +-----
 .../WEB-INF/jsp/nlib/rent/listRentItems.jsp     |  4 +++-
 src/main/webapp/js/nlib.js                      | 17 +++++++++++++++++
 5 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp b/src/main/webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp
index 894b6d5e..8d0eaed9 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/read/confirmRead.jsp
@@ -203,7 +203,7 @@ $(document).ready(function() {
           <c:set var="curType" value="" />
           <c:set var="selItems" value="" />
           
-                            <h3><label>방문열람신청확인  ${readVO.mngOrgNm }</label></h3>
+                            <h3><label>방문열람신청확인 : ${readVO.mngOrgNm }</label></h3>
                                 <div class="list-cart">
                                     <div class="list t-tit-line">
                                         <div class="t-data t-mo">자료정보</div>
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/read/listReadItems.jsp b/src/main/webapp/WEB-INF/jsp/nlib/read/listReadItems.jsp
index d342604a..0aad4aab 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/read/listReadItems.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/read/listReadItems.jsp
@@ -130,7 +130,7 @@ function fn_search(reqStatusDivCd) {
                 		 '<span class="date">' + gfn_formatDateStr(obj.hopeReqPridDtmFrom,"-") + '</span><span class="date">' + gfn_formatDateStr(obj.hopeReqPridDtmTo,"-") + '</span>'
                 		 )); /* 희망열람기간 */  
                  div.append($('<div />').attr('class', 'n-return').html(
-                         '<span class="date">' + gfn_formatDateStr(obj.reqPsblDtmFrom,"-") + '</span><span class="date">' + gfn_formatDateStr(obj.reqPsblDtmTo,"-") + '</span>'
+                         '<span class="date">' + gfn_formatTimeStr(obj.reqPsblDtmFrom,"-") + '</span><span class="date">' + gfn_formatTimeStr(obj.reqPsblDtmTo,"-") + '</span>'
                          )); /* 방문예정일자 */  
                  
                  var statusHtml1 = "";
@@ -138,8 +138,9 @@ function fn_search(reqStatusDivCd) {
                  var statusHtml3 = "";
                  if(obj.reqStatusDivCd == null) {
                 	 statusHtml1 = '<span class="ti imposs">-<span class="da"></span></span>';
-                 } else if(obj.reqStatusDivCd == "A0") { // 신청 
-                	 statusHtml1 = '<span class="ti imposs">' + obj.reqStatusDivNm + '<span class="da"></span></span>';
+                 } else if(obj.reqStatusDivCd == "A0") { // 신청
+                	 //statusHtml1 = '<span class="ti imposs">' + obj.reqStatusDivNm + '<span class="da"></span></span>'; <% // 신청인 경우, '-'로 표출 (2021.12.02 김혜준대리 요청) %>
+                	 statusHtml1 = '<span class="ti imposs">-<span class="da"></span></span>';
                 	 statusHtml2 = '<button type="button" onclick="fn_cancel(\'' + obj.title + '\',\'' + obj.mngOrgCd + '\', \'' + obj.reqId + '\', \'' + obj.masterId + '\')">취소</button>';
                  } else if(obj.reqStatusDivCd == "A1") { // 승인 
                 	 statusHtml1 = '<span class="ti   poss">' + obj.reqStatusDivNm + '<span class="da">' + gfn_formatDateStr(obj.modDd,"-") + '</span></span>';
@@ -286,7 +287,7 @@ function fn_search(reqStatusDivCd) {
                                                 <div class="n-data">자료정보</div>
                                                 <div class="n-subscription">신청</div>
                                                 <div class="n-visit">희망방문일</div>
-                                                <div class="n-return">반납예정일</div>
+                                                <div class="n-return">방문예정일</div>
                                                 <div class="n-state">신청상태</div>
                                             </div>
                                             <div class="no-result" style="display:none;">
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/rent/insertRentItems.jsp b/src/main/webapp/WEB-INF/jsp/nlib/rent/insertRentItems.jsp
index 006da46d..06b8578d 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/rent/insertRentItems.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/rent/insertRentItems.jsp
@@ -174,7 +174,7 @@ $(document).ready(function() {
                             <div class="tabs_item">
                                 <div class="inner">
                                     <div class="list-cart-wrap complete">
-                                        <h3><label>${rentVO.mngOrgNm } (<span id="totCnt" class="count">0</span>)</label></h3>
+                                        <h3><label>대출신청/예약완료 : ${rentVO.mngOrgNm }</label></h3>
                                         <div class="list-cart">
                                             <div class="list t-tit-line">
                                                 <div class="t-data t-mo">자료정보</div>
@@ -266,10 +266,6 @@ $(document).ready(function() {
                                         </c:if>
                                     </div>
                                     
-                                    <script>
-                                    $("#totCnt").text("${(rentType1Cnt + rentType2Cnt) }");
-                                    </script>
-                                    
                                     <p class="text">- 대출신청/예약 내역은 [마이페이지 &#62; 대출관리]에서 확인하실 수 있습니다.</p>
                                     <p class="text">- 주어진 기한 안에 방문하지 않는 경우, 신청/예약이 자동 취소됩니다.</p>
                                     
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/rent/listRentItems.jsp b/src/main/webapp/WEB-INF/jsp/nlib/rent/listRentItems.jsp
index 10759e8b..d0b3b576 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/rent/listRentItems.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/rent/listRentItems.jsp
@@ -142,7 +142,9 @@ function fn_search(bookLtRvStatusCd) {
                  if(obj.bookLtRvStatusCd == null) {
                 	 statusHtml = "";
                  } else if(obj.bookLtRvStatusCd.startsWith("A")) {
-                	 statusHtml = "<button type='button' onclick='fn_cancel(\"" + obj.title + "\",\"" + obj.bookLtRvStatusNm + "\",\"" + obj.mngOrgCd + "\", \"" + obj.rsrvId + "\")'>취소</button>";
+                	 if(obj.rsrvDivCd == "2") obj.bookLtRvStatusNm = "예약";
+                	 else obj.bookLtRvStatusNm = "신청";
+                     statusHtml = "<button type='button' onclick='fn_cancel(\"" + obj.title + "\",\"" + obj.bookLtRvStatusNm + "\",\"" + obj.mngOrgCd + "\", \"" + obj.rsrvId + "\")'>취소</button>";
                  } else if(obj.bookLtRvStatusCd.startsWith("R")) {
                      statusHtml = "<span class=\"da\">" + gfn_formatDateStr(obj.rtnDd,"-") + "</span>";
                  }
diff --git a/src/main/webapp/js/nlib.js b/src/main/webapp/js/nlib.js
index 798841b6..f435434d 100644
--- a/src/main/webapp/js/nlib.js
+++ b/src/main/webapp/js/nlib.js
@@ -385,6 +385,23 @@ function gfn_formatDateStr(yyyymmdd, defVal) {
 	return defVal;
 }
 
+function gfn_formatTimeStr(timeStr, defVal) {
+
+	if(gfn_isEmpty(timeStr)) return defVal;
+	
+	if(4 <= timeStr.length && timeStr.length < 6) {
+		return timeStr.substr(0, 4);
+	} else if(6 <= timeStr.length && timeStr.length < 8) {
+		return timeStr.substr(0, 4) + "-" + timeStr.substr(4,2);
+	} else if(8 <= timeStr.length && timeStr.length < 12) {
+		return timeStr.substr(0, 4) + "-" + timeStr.substr(4,2) + "-" + timeStr.substr(6, 2);
+	} else if(12 <= timeStr.length) {
+		return timeStr.substr(0, 4) + "-" + timeStr.substr(4,2) + "-" + timeStr.substr(6, 2) + " " + timeStr.substr(8, 2) + ":" + timeStr.substr(10, 2);
+	}  
+		
+	return defVal;
+}
+
 // 원문보기 
 var DOC_VIEW_URL = "https://port.nculture.org/npdfView.do?npdf=N";
 var VIDEO_VIEW_URL = "https://port.nculture.org/nvodView.do?nvod=N";

From 5d5dc1d51a79d554d43d0e34748d92bea2ba1d85 Mon Sep 17 00:00:00 2001
From: com02 <com02@DESKTOP-EUO00N3>
Date: Mon, 6 Dec 2021 11:41:10 +0900
Subject: [PATCH 2/2] =?UTF-8?q?=EC=A0=91=EA=B7=BC=EC=84=B1=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp | 14 ++++++++++++++
 src/main/webapp/css/default.css               |  8 ++++----
 src/main/webapp/js/default.js                 | 10 ++++++++++
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp b/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp
index a8a33cfc..712e74b6 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp
@@ -29,6 +29,7 @@ $(document).ready(function() {
     $('.skip-nav a:nth-of-type(4)').focusout(function(){
     	$('.skip-nav').hide();
     	$('.skip-nav a').css('z-index','0');
+    	$('.wrap header .inner .search-wrap .search-input .btn-search-detail').focus();
     });
     $(".skip-nav a").keydown(function (e) {
     	if (e.keyCode == 13) { 
@@ -37,6 +38,19 @@ $(document).ready(function() {
     	} 
     });    
     
+    $('.wrap .nav-wrap #primary-nav ul li a').focus(function(){
+    	$('.wrap .nav-wrap #primary-nav ul li .sub-menu').show();
+    });
+    $('.mo-nav-wrap .login_box .btns_box button.btn_login').focus(function(){
+    	$('.wrap .nav-wrap #primary-nav ul li .sub-menu').hide();
+    });
+    
+    $('.sec6 .onlineSwiper .items .List .inner div.thumbnail div.detail-cover > a').focus(function(){
+    	$('.sec6 .onlineSwiper .items .List .inner div.thumbnail div.detail-cover').css('opacity','1');
+    });
+    $('.sec6 .inner .more-btn a').focus(function(){
+    	$('.sec6 .onlineSwiper .items .List .inner div.thumbnail div.detail-cover').css('opacity','0');
+    });
 });
 
 function fn_search(keyword) {
diff --git a/src/main/webapp/css/default.css b/src/main/webapp/css/default.css
index 7eb66b10..fdc7e0cc 100644
--- a/src/main/webapp/css/default.css
+++ b/src/main/webapp/css/default.css
@@ -162,7 +162,7 @@ section .inner p.desc {font-size: 18px;color:#666;margin-bottom:40px;}
 .sec1 .inner .banner h3 {font-size:36px;line-height:48px;color:#fff;font-weight: 500;text-align:center;width:100%;position: absolute;top:200px;}
 .sec1 .inner .banner p {font-size:16px;line-height:24px;color:#fff;font-weight: 200;text-align:center;width:100%;position: absolute;top:320px;}
 .sec1 .inner .banner p:nth-of-type(2) {top:400px;}
-.sec1 .inner .banner p:nth-of-type(2) a {border:1px solid #fff;border-radius:50px;color:#fff;font-size:14px;padding:5px 20px;}
+.sec1 .inner .banner p:nth-of-type(2) a {border:1px solid #000;background:#000;border-radius:50px;color:#fff;font-size:14px;padding:5px 20px;}
 .sec1 .inner .banner p:nth-of-type(2) a:hover {border:1px solid #fff;background:#fff;color:#333;}
 .MainSwiper {width:100%;height:100%;display:inline-block;} 
 .MainSwiper .swiper-button-next:after, .MainSwiper .swiper-rtl .swiper-button-prev:after, .MainSwiper .swiper-button-prev:after, .MainSwiper .swiper-rtl .swiper-button-next:after {color:#fff;}
@@ -232,7 +232,7 @@ transform: rotate(45deg);
 /********** 메인섹션4 **********/
 .sec4 .inner .middle-banner {background: url(/images/bg/bg-sec4-bg.jpg) no-repeat;width:100%;height:317px;background-size: cover;}
 .sec4 .inner .middle-banner h3 {padding:70px 0px 20px;font-size:36px;line-height: 46px;color: #fff;}
-.sec4 .inner .middle-banner h3 strong {color:#feb855;}
+.sec4 .inner .middle-banner h3 strong {color:#ffcf8b;text-shadow:1px 1px 1px rgba(0,0,0,0.8);}
 .sec4 .inner .middle-banner p {font-size:18px;font-weight: 100;color:#fff;}
 
 
@@ -1584,7 +1584,7 @@ transform: rotate(45deg);}
 .qna .list-table-wrap li:hover .t-tit a {border-bottom:1px solid #376795;padding-bottom:1px;color:#376795;display: inline;}
 .qna .btn-box {float:right;}
 
-.no-result {padding:60px 0px;font-size:14px;color:#999;text-align:center;}
+.no-result {padding:60px 0px;font-size:14px;color:#666;text-align:center;}
 
 .privacy .top-bg {width:1200px;height:270px;margin:0 auto 50px;background: url(/images/bg/bg-privacy.jpg) no-repeat center;text-align: left;}
 .privacy .top-bg p {color:#fff;}
@@ -1993,7 +1993,7 @@ animation: animate-bg2 2.0s 1.9s ease-in infinite;
 .btn-green {background: #327f8f;color: #fff;}
 .btn-green:focus,
 .btn-green:hover {background: #1a6878;transition: background .3s ease;}
-.btn-orange {background: #ec8c26;color: #fff;}
+.btn-orange {background: #d27818;color: #fff;}
 .btn-orange:focus,
 .btn-orange:hover {background: #e26c26;transition: background .3s ease;}
 .btn-gray {background: #666;color: #fff;}
diff --git a/src/main/webapp/js/default.js b/src/main/webapp/js/default.js
index 9e8a49ad..ec60d44f 100644
--- a/src/main/webapp/js/default.js
+++ b/src/main/webapp/js/default.js
@@ -33,6 +33,16 @@ $(document).ready(function(){
         });
     });
     
+    //메인 슬라이드 접근성
+    $('.MainSwiper .loop-count button.remote span').append('<span class="ir">일시정지</span>');
+    $('.MainSwiper .loop-count button.remote').click(function(){
+        if($('.MainSwiper .loop-count button.remote').hasClass('restart') === false) {
+            $('.MainSwiper .loop-count button.remote .ir').text('일시정지');
+        } else {
+            $('.MainSwiper .loop-count button.remote .ir').text('재생');
+        }
+    });
+    
     /* 인기자료 탭메뉴 */
     (function ($) {
         $(".tab ul.tabs").addClass("active").find("> li:eq(0)").addClass("current");