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/cmm/home.jsp b/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp
index 0b7b4427..ba8e4f1e 100644
--- a/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp
+++ b/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
<%@ page language="java" contentType="text/html; charset=UTF-8" %>
<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
<%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
@@ -489,3 +490,496 @@ function fn_listPops(typeDivCd) {
+=======
+<%@ page language="java" contentType="text/html; charset=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="ui" uri="http://egovframework.gov/ctl/ui" %>
+<%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
+<%@ taglib prefix="sec" uri="http://www.springframework.org/security/tags"%>
+
+
+
+
+
+
+
+
+
+ 키워드 섹션영역
+
+
+
AI 추천 키워드
+
어떤 자료들을 소장 중인지 키워드로 살펴보세요!
+
+
+
+
+
+
+
+
+
+ 문화원픽 섹션영역
+
+
+
문화원's Pick
+
${mngOrgNm }이가 추천하는 자료를 만나보세요!
+
+
+
+
+
+
+
+
+
+
+ 중간배너 섹션영역
+
+
+
회원가입만 하면 발급되는
간편 온라인 회원증!
+
문화원 소장자료관 회원가입 시 해당 문화원에서
사용할 수 있는 온라인 회원증이 발급됩니다.
+
+
+
+
+
+
+
+ 인기자료 섹션영역
+
+
인기 자료
+
이런 인기자료들이 있어요!
+
+
+
+
+
+
+
+ -
+
+
${itemPop.typeDivNm }
+
${itemPop.title }
+
+
+
주제분야-${itemPop.subjectNm }
+
생산기관-${itemPop.orgNm }
+
생산년도-${itemPop.creatYyyy }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 온라인자료관 섹션영역
+
+
온라인 자료관
+
문화원 전자자료를 온라인으로 간편하게 열람해보세요!
+
+
+
+
+
+
+
+
+
+

+
+
${itemOnline.title }
+
+ - 자료유형-${itemOnline.typeDivNm }
+ - 주제분야-${itemOnline.subjectNmUp }
+ - 생산기관-${itemOnline.orgNm }
+ - 생산년도-${itemOnline.creatYyyy }
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+>>>>>>> branch 'master' of http://docs.nculture.org:30000/nculture/iams.nlib
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(){
-
-
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{
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()
-
+
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(){
-
+
인증이 완료되었습니다.
@@ -638,7 +654,7 @@ function fn_cancel(){
-
+
인증이 완료되었습니다.
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){
-
+
인증이 완료되었습니다.
@@ -670,7 +686,7 @@ function snsUnlink(snsId){
-
+
인증이 완료되었습니다.