From 33422e791c841e3482d53cc6af149f4d4a81a72c Mon Sep 17 00:00:00 2001
From: JSYOO <JSYOO@DESKTOP-U1IONCV>
Date: Mon, 29 Nov 2021 10:28:43 +0900
Subject: [PATCH 1/5] =?UTF-8?q?=ED=9A=8C=EC=9B=90=EC=A0=95=EB=B3=B4?=
 =?UTF-8?q?=EC=88=98=EC=A0=95,=20=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85?=
 =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=20=EB=AA=A8=EB=B0=94=EC=9D=BC,?=
 =?UTF-8?q?=EC=9D=B4=EB=A9=94=EC=9D=BC=EC=9D=B8=EC=A6=9D=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../java/nlib/user/web/MemberController.java  |  4 +--
 .../jsp/nlib/member/insertMemberInfoForm.jsp  | 22 +++++++++++++---
 .../WEB-INF/jsp/nlib/userInfo/putMyInfo.jsp   | 26 +++++++++++++++----
 3 files changed, 42 insertions(+), 10 deletions(-)

diff --git a/src/main/java/nlib/user/web/MemberController.java b/src/main/java/nlib/user/web/MemberController.java
index b8b9777d..2493e97d 100644
--- a/src/main/java/nlib/user/web/MemberController.java
+++ b/src/main/java/nlib/user/web/MemberController.java
@@ -520,7 +520,7 @@ public class MemberController extends NlibCommonController{
 		
 		if(result == "templateFail")
 		{
-			map.put("msg","이메일 발송에 실패하였습니다. \\n관리자에게 문의하여 주시기 바랍니다.");
+			map.put("msg","이메일 발송에 실패하였습니다. \n관리자에게 문의하여 주시기 바랍니다.");
 	    	map.put("emailCertYn","N");
 			return map;
 		}
@@ -697,7 +697,7 @@ public class MemberController extends NlibCommonController{
 		//사용자 정보를 가져온다.
 		NlibLoginVO loginVO = getNlibLoginVO(authentication);
 		if(loginVO == null) {
-			model.addAttribute("msg","잘못된 접근입니다. \\n장시간 대기로 다시 로그인 하신 후, 이용해 주시기 바랍니다.");
+			model.addAttribute("msg","잘못된 접근입니다. \n장시간 대기로 다시 로그인 하신 후, 이용해 주시기 바랍니다.");
 			model.addAttribute("url","${pageContext.request.contextPath}"+"/");
 			return "nlib/cmm/alert";
 		}
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/member/insertMemberInfoForm.jsp b/src/main/webapp/WEB-INF/jsp/nlib/member/insertMemberInfoForm.jsp
index 687ab412..02055f42 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/member/insertMemberInfoForm.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/member/insertMemberInfoForm.jsp
@@ -199,7 +199,11 @@ $(document).ready(function() {
 		}else{
 			$("#mobileCertYn").val("N");
 	        $("#mobileCertSendBtn").css("display","");
+	        $("#mobileReSend").css("display","none");
 	        $("[id^='mobileSuc']").css("display","none");
+	        $("#mobileCertSendBtn").removeClass('btn-gray');
+            $("#mobileCertSendBtn").addClass('btn-color');
+            $("#mobileCertSendBtn").attr("disabled", false);
 		}
 	});
    <%
@@ -216,8 +220,11 @@ $(document).ready(function() {
         }else{
             $("#emailCertYn").val("N");
             $("#emailCertSendBtn").css("display","");
-            $("#emailReSend").css("display","");
+            $("#emailReSend").css("display","none");
             $("[id^='emailSuc']").css("display","none");
+            $("#emailCertSendBtn").removeClass('btn-gray');
+            $("#emailCertSendBtn").addClass('btn-color');
+            $("#emailCertSendBtn").attr("disabled", false);
         }
     });
    <%
@@ -265,7 +272,12 @@ function emailCert(){
             
             if(result.emailCertYn=="Y")
            	{
+            	$("#emailVrfctNo").val("");
             	$("#emailCertYn").val("N");
+            	$("#emailCertSendBtn").removeClass('btn-color');
+                $("#emailCertSendBtn").addClass('btn-gray');
+                $("#emailCertSendBtn").attr("disabled", true);
+                $("#emailReSend").css("display","");
             	$("[id^='emailSuc']").css("display","none");
                 $("[id^='emailVrfctNo']").css("display","inline-block");
                 mailDoubleSubmitFlag = false;
@@ -347,7 +359,11 @@ function mobileCert(){
         data : {"mobileNo" : mobileNo},
         success : function(result){
             alert("인증번호가 발송됐습니다.");
+            $("#mobileVrfctNo").val("");
             $("#mobileCertYn").val("N");
+            $("#mobileCertSendBtn").removeClass('btn-color');
+            $("#mobileCertSendBtn").addClass('btn-gray');
+            $("#mobileCertSendBtn").attr("disabled", true);
             $("#mobileReSend").css("display","");
             $("[id^='mobileSuc']").css("display","none");
             $("[id^='mobileVrfctNo']").css("display","inline-block");
@@ -621,7 +637,7 @@ function fn_cancel(){
                                     </div>
                                     <div class="row" id="mobileCertForm">
                                         <label for="mobileVrfctNo" style="display:none;">인증번호 입력</label><input class="form-control cer" type="text" id='mobileVrfctNo' name='mobileVrfctNo' style="display:none;" onKeyup="this.value=this.value.replace(/[^0-9]/g,'');" maxlength="6" placeholder=" SMS로 발송된 인증번호를 입력하세요"/>
-                                        <button type="button" class="btn-gray" id='mobileVrfctNoBtn' style="display:none;" onclick='certMobileCheck();'>확인</button>
+                                        <button type="button" class="btn-color" id='mobileVrfctNoBtn' style="display:none;" onclick='certMobileCheck();'>확인</button>
                                         <span id="mobileSuc" class="suc">인증이 완료되었습니다.</span>
                                         <span id="mobileSuc-chk" class="chk-suc"></span>
                                     </div>
@@ -638,7 +654,7 @@ function fn_cancel(){
                                     </div>
                                     <div class="row" id="emailCertForm">
                                         <label for="emailVrfctNo" style="display:none;">인증번호 입력</label><input class="form-control cer" type="text" id='emailVrfctNo' name='emailVrfctNo' style="display:none;" placeholder=" 이메일로 발송된 인증번호를 입력하세요"/>
-                                        <button type="button" class="btn-gray" id='emailVrfctNoBtn' style="display:none;" onclick='certEmailCheck()'>확인</button>
+                                        <button type="button" class="btn-color" id='emailVrfctNoBtn' style="display:none;" onclick='certEmailCheck()'>확인</button>
                                         <span id="emailSuc" class="suc">인증이 완료되었습니다.</span>
                                         <span id="emailSuc-chk" class="chk-suc"></span>
                                     </div>
diff --git a/src/main/webapp/WEB-INF/jsp/nlib/userInfo/putMyInfo.jsp b/src/main/webapp/WEB-INF/jsp/nlib/userInfo/putMyInfo.jsp
index 334ceaa9..0c007e99 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/userInfo/putMyInfo.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/userInfo/putMyInfo.jsp
@@ -72,8 +72,11 @@ $(document).ready(function() {
         }else{
             $("#mobileCertYn").val("N");
             $("#mobileCertSendBtn").css("display","");
-            $("#mobileReSend").css("display","");
+            $("#mobileReSend").css("display","none");
             $("[id^='mobileSuc']").css("display","none");
+            $("#mobileCertSendBtn").removeClass('btn-gray');
+            $("#mobileCertSendBtn").addClass('btn-color');
+            $("#mobileCertSendBtn").attr("disabled", false);
         }
     });
     <%
@@ -88,10 +91,13 @@ $(document).ready(function() {
             $("[id^='emailSuc']").css("display","inline-block");
             $("[id^='emailVrfctNo']").css("display","none");
         }else{
-            $("#emailCertYn").val("N");
+        	$("#emailCertYn").val("N");
             $("#emailCertSendBtn").css("display","");
-            $("#emailReSend").css("display","");
+            $("#emailReSend").css("display","none");
             $("[id^='emailSuc']").css("display","none");
+            $("#emailCertSendBtn").removeClass('btn-gray');
+            $("#emailCertSendBtn").addClass('btn-color');
+            $("#emailCertSendBtn").attr("disabled", false);
         }
     });
     
@@ -324,7 +330,12 @@ function emailCert(){
           
           if(result.emailCertYn=="Y")
           {
+        	  $("#emailVrfctNo").val("");
               $("#emailCertYn").val("N");
+              $("#emailCertSendBtn").removeClass('btn-color');
+              $("#emailCertSendBtn").addClass('btn-gray');
+              $("#emailCertSendBtn").attr("disabled", true);
+              $("#emailReSend").css("display","");
               $("[id^='emailSuc']").css("display","none");
               $("[id^='emailVrfctNo']").css("display","inline-block");
               mailDoubleSubmitFlag = false;
@@ -408,7 +419,12 @@ function mobileCert(){
             "pageName" : "myInfo"},
         success : function(result){
             alert("인증번호가 발송됐습니다.");
+            $("#mobileVrfctNo").val("");
             $("#mobileCertYn").val("N");
+            $("#mobileCertSendBtn").removeClass('btn-color');
+            $("#mobileCertSendBtn").addClass('btn-gray');
+            $("#mobileCertSendBtn").attr("disabled", true);
+            $("#mobileReSend").css("display","");
             $("[id^='mobileSuc']").css("display","none");
             $("[id^='mobileVrfctNo']").css("display","inline-block");
             mobileDoubleSubmitFlag = false;
@@ -653,7 +669,7 @@ function snsUnlink(snsId){
                                     </div>
                                     <div class="row" id="mobileCertForm">
                                         <label for="mobileVrfctNo" style="display:none;">인증번호 입력</label><input class="form-control cer" type="text" style="display:none;" id='mobileVrfctNo' name='mobileVrfctNo' placeholder=" SMS로 발송된 인증번호를 입력하세요"/>
-                                        <button type="button" class="btn-gray" style="display:none;" id='mobileVrfctNoBtn' onclick='certMobileCheck();'>확인</button>
+                                        <button type="button" class="btn-color" style="display:none;" id='mobileVrfctNoBtn' onclick='certMobileCheck();'>확인</button>
                                         <span id="mobileSuc" class="suc">인증이 완료되었습니다.</span>
                                         <span id="mobileSuc-chk" class="chk-suc"></span>
                                     </div>
@@ -670,7 +686,7 @@ function snsUnlink(snsId){
                                     </div>
                                     <div class="row" id="emailCertForm">
                                         <label for="emailVrfctNo" style="display:none;">인증번호 입력</label><input class="form-control cer" type="text" id='emailVrfctNo'  style="display:none;" name='emailVrfctNo' placeholder=" 이메일로 발송된 인증번호를 입력하세요"/>
-                                        <button type="button" class="btn-gray" id='emailVrfctNoBtn' style="display:none;" onclick='certEmailCheck()'>확인</button>
+                                        <button type="button" class="btn-color" id='emailVrfctNoBtn' style="display:none;" onclick='certEmailCheck()'>확인</button>
                                         <span id="emailSuc" class="suc">인증이 완료되었습니다.</span>
                                         <span id="emailSuc-chk" class="chk-suc"></span>
                                     </div>

From 864568640f6985cca867fd520a14df49291eff22 Mon Sep 17 00:00:00 2001
From: JSYOO <JSYOO@DESKTOP-U1IONCV>
Date: Mon, 29 Nov 2021 10:29:01 +0900
Subject: [PATCH 2/5] =?UTF-8?q?=EC=BB=A4=EB=B0=8B=EC=9A=A9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp
index f4a1281d..81068111 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp
@@ -121,7 +121,7 @@ function fnSetInitialValue()
         $("#creatYyyyStart").val("${searchVO.creatYyyyStart}"); 
         $("#creatYyyyEnd").val("${searchVO.creatYyyyEnd}"); 
         if(creatYyyyYn == "Y")
-        {
+        { 
             $("#creatYyyyYn").prop('checked',true);         
         }
     }else{

From 8bd69879d7d2ad7dfc22efa42ea5b206042978fc Mon Sep 17 00:00:00 2001
From: KNKIM <knkim@digitalship.co.kr>
Date: Mon, 29 Nov 2021 10:54:33 +0900
Subject: [PATCH 3/5] =?UTF-8?q?=EB=B0=B0=EB=84=88=201=EA=B1=B4=20=EC=9D=B4?=
 =?UTF-8?q?=ED=95=98=20=EC=B2=98=EB=A6=AC?=
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 | 4 ++++
 1 file changed, 4 insertions(+)

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 7ffca4c8..44b86d00 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp
@@ -132,6 +132,8 @@ function fn_listPops(typeDivCd) {
                     </c:if>
  					
 					</ul>
+					
+					<c:if test="${fn:length(listBannerInfos) > 1 }">
 					<div class="swiper-button-next"></div>
 		      		<div class="swiper-button-prev"></div>
 		      		
@@ -142,6 +144,8 @@ function fn_listPops(typeDivCd) {
 							<button class="remote"><span></span></button>
 						</div>
 					</div>
+                    </c:if>
+					
 				</div>
 			</div>
 			

From 001d09859b411d182295844077038ac31adcbace Mon Sep 17 00:00:00 2001
From: JSYOO <JSYOO@DESKTOP-U1IONCV>
Date: Mon, 29 Nov 2021 11:03:23 +0900
Subject: [PATCH 4/5] =?UTF-8?q?=EB=B9=84=EB=B0=80=EB=B2=88=ED=98=B8?=
 =?UTF-8?q?=EC=B0=BE=EA=B8=B0=EC=8B=9C=20=EB=A7=88=EC=9D=B4=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=A7=80,=20=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85=20?=
 =?UTF-8?q?=EA=B3=84=EC=A0=95=ED=86=B5=ED=95=A9=EC=8B=9C=20=EB=8B=AB?=
 =?UTF-8?q?=EA=B8=B0=EB=B2=84=ED=8A=BC=20=ED=95=A8=EC=88=98=EA=B5=AC?=
 =?UTF-8?q?=EB=B6=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/jsp/nlib/member/initPasswordFormPopup.jsp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/nlib/member/initPasswordFormPopup.jsp b/src/main/webapp/WEB-INF/jsp/nlib/member/initPasswordFormPopup.jsp
index 8d56f323..632832e6 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/member/initPasswordFormPopup.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/member/initPasswordFormPopup.jsp
@@ -30,11 +30,12 @@ $(document).ready(function() {
 	if(previousPage == "alreadySignUpPopup")
 	{
 		document.getElementById("cancle").setAttribute("onClick", "fn_cancle()");
+		document.getElementById("findCancle").setAttribute("onClick", "fn_cancle()");
 	}else
 	{
 		document.getElementById("cancle").setAttribute("onClick", "fn_closeLayerPopup()");
+		document.getElementById("findCancle").setAttribute("onClick", "fn_closeLayerPopup()");
 	}
-		
 });
 
 var mailDoubleSubmitFlag = false;
@@ -123,7 +124,7 @@ function fn_cancle()
                 <button type="button" class="btn btn-color" onclick="goFindPw();">확인</button>
                 <button type="button" class="btn btn-gray close" id="cancle">취소</button> 
             </div>
-            <button type="button" class="find-close" onclick="fn_closeLayerPopup();"></button>
+            <button type="button" class="find-close" id="findCancle"></button>
         </div>
         <div class="Bg"></div>
         </form>

From 42ed91193452568a91b0d9ddd66beed08b2b1590 Mon Sep 17 00:00:00 2001
From: KNKIM <knkim@digitalship.co.kr>
Date: Mon, 29 Nov 2021 11:06:33 +0900
Subject: [PATCH 5/5] =?UTF-8?q?=EB=8C=80=EC=B6=9C=EC=98=88=EC=95=BD,=20?=
 =?UTF-8?q?=EB=B0=A9=EB=AC=B8=EC=97=B4=EB=9E=8C=20=EC=8B=A0=EC=B2=AD=20:?=
 =?UTF-8?q?=20=ED=98=84=EC=9E=AC=20=EA=B0=80=EB=8A=A5=ED=95=9C=20=EA=B2=BD?=
 =?UTF-8?q?=EC=9A=B0=EC=97=90=EB=A7=8C=20=EB=B2=84=ED=8A=BC=20=EB=B3=B4?=
 =?UTF-8?q?=EC=97=AC=EC=A7=80=EB=8F=84=EB=A1=9D=20=EC=B2=98=EB=A6=AC=20(?=
 =?UTF-8?q?=EC=9A=94=EC=B2=AD:=20=EA=B9=80=ED=98=9C=EC=A4=80=EB=8C=80?=
 =?UTF-8?q?=EB=A6=AC)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp     | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp
index 1ff07405..dd70c451 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/collection/searchItemDetail.jsp
@@ -218,10 +218,8 @@ function goList(){
                             <div class="b-btn">
                                 <c:if test="${result.ableRentAppNow }"><button type="button" class="btn btn-color" onclick="gfn_rentItem('${result.mngOrgCd}', '${result.masterId}')">대출신청</button></c:if>
                                 <c:if test="${not result.ableRentAppNow and result.ableRentResNow }"><button type="button" class="btn btn-color" onclick="gfn_rentItem('${result.mngOrgCd}', '${result.masterId}')">대출예약</button></c:if>
-                                <c:if test="${result.ableRent and not result.ableRentNow }"><button type="button" class="btn btn-gray" onclick="alert('현재 대출신청 또는 예약이 불가능한 상태입니다.')">대출신청</button></c:if>
                                 
                                 <c:if test="${result.ableReadNow }"><button type="button" class="btn btn-green" onclick="gfn_reserveReadItem('${result.mngOrgCd}', '${result.masterId}')">방문열람신청</button></c:if>
-                                <c:if test="${result.ableRead and not result.ableReadNow }"><button type="button" class="btn btn-gray" onclick="alert('현재 방문열람신청이 불가능한 상태입니다.')">방문열람신청</button></c:if>
                                 
                                 <c:if test="${result.ableRent or result.ableRead }">
                                     <button type="button" class="btn btn-orange" onclick="fn_addRentCart('${result.masterId}', '${result.ableRent}', '${result.ableRead}')">카트담기</button>