diff --git a/src/main/resources/egovframework/message/message-common.properties b/src/main/resources/egovframework/message/message-common.properties index 28b26007..50313a44 100644 --- a/src/main/resources/egovframework/message/message-common.properties +++ b/src/main/resources/egovframework/message/message-common.properties @@ -135,6 +135,7 @@ fail.common.idsearch = \uc544\uc774\ub514\ub97c \ucc3e\uc744\uc218 \uc5c6\uc2b5\ fail.common.pwsearch = \ube44\ubc00\ubc88\ud638\ub97c \ucc3e\uc744\uc218 \uc5c6\uc2b5\ub2c8\ub2e4. fail.request.msg = \uc694\uccad\ucc98\ub9ac\ub97c \uc2e4\ud328\ud558\uc600\uc2b5\ub2c8\ub2e4. fail.common.login.ip = \ub4f1\ub85d\ub41c IP\uac00 \uc544\ub2c8\ubbc0\ub85c \ub85c\uadf8\uc778\uc774 \uac70\ubd80\ub418\uc5c8\uc2b5\ub2c8\ub2e4. +fail.request.msg = \ucc98\ub9ac\uc911 \uc624\ub958\uac00 \ubc1c\uc0dd\ud588\uc2b5\ub2c8\ub2e4.\uad00\ub9ac\uc790\uc5d0\uac8c \ubb38\uc758\ud574\uc8fc\uc138\uc694. #UI User Message# fail.user.passwordUpdate1=\ud604\uc7ac \ube44\ubc00\ubc88\ud638\uac00 \ub9de\uc9c0 \uc54a\uc2b5\ub2c8\ub2e4. diff --git a/src/main/webapp/META-INF/MANIFEST.MF b/src/main/webapp/META-INF/MANIFEST.MF index 813d708a..7cfc6356 100644 --- a/src/main/webapp/META-INF/MANIFEST.MF +++ b/src/main/webapp/META-INF/MANIFEST.MF @@ -1,5 +1,5 @@ -Manifest-Version: 1.0 -Built-By: com02 -Build-Jdk: 1.8.0_201 -Created-By: Maven Integration for Eclipse - +Manifest-Version: 1.0 +Built-By: ecpla +Build-Jdk: 1.8.0_201 +Created-By: Maven Integration for Eclipse + diff --git a/src/main/webapp/META-INF/maven/nlib/nlib/pom.properties b/src/main/webapp/META-INF/maven/nlib/nlib/pom.properties index 1f9ac057..49707cb7 100644 --- a/src/main/webapp/META-INF/maven/nlib/nlib/pom.properties +++ b/src/main/webapp/META-INF/maven/nlib/nlib/pom.properties @@ -1,7 +1,7 @@ -#Generated by Maven Integration for Eclipse -#Tue Dec 14 09:54:36 KST 2021 -version=1.0.0 -groupId=nlib -m2e.projectName=iams.nlib -m2e.projectLocation=D\:\\iams\\workspace\\iams.nlib -artifactId=nlib +#Generated by Maven Integration for Eclipse +#Mon Mar 13 10:07:45 KST 2023 +version=1.0.0 +groupId=nlib +m2e.projectName=iams.nlib +m2e.projectLocation=D\:\\work_source\\iams\\workspace\\iams.nlib +artifactId=nlib diff --git a/src/main/webapp/META-INF/maven/nlib/nlib/pom.xml b/src/main/webapp/META-INF/maven/nlib/nlib/pom.xml index be6c718b..1bc8bf0c 100644 --- a/src/main/webapp/META-INF/maven/nlib/nlib/pom.xml +++ b/src/main/webapp/META-INF/maven/nlib/nlib/pom.xml @@ -240,6 +240,11 @@ 2.8.1 --> + + org.jasypt + jasypt-spring3 + 1.9.2 + com.googlecode.json-simple @@ -380,6 +385,13 @@ commons-lang3 3.3.2 + + + + com.googlecode.owasp-java-html-sanitizer + owasp-java-html-sanitizer + 20211018.2 + @@ -588,6 +600,10 @@ + + + + diff --git a/src/main/webapp/WEB-INF/jsp/nlib/cmm/headerSubPart.jsp b/src/main/webapp/WEB-INF/jsp/nlib/cmm/headerSubPart.jsp index 93383908..4b662727 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/cmm/headerSubPart.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/cmm/headerSubPart.jsp @@ -38,28 +38,31 @@ function fn_getMemberCard() {

소장자료관

-
-

검색

-
-
- -
- 검색 -
- - -
-
- - - -
-
-
-
+ + +
+

검색

+
+
+ +
+ 검색 +
+ + +
+
+ + + +
+
+
+
+
    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 7ed661ad..0471a4cc 100644 --- a/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp +++ b/src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp @@ -24,8 +24,72 @@ $(document).ready(function() { $('.sec6 .inner .more-btn a').focus(function(){ $('.sec6 .onlineSwiper .items .List .inner div.thumbnail div.detail-cover').css('opacity','0'); }); + + // 현재 viewoport내의 element 확인 + $.fn.isInViewport = function() { + var elementTop = $(this).offset().top; + var elementBottom = elementTop + $(this).outerHeight(); + + var viewportTop = $(window).scrollTop(); + var viewportBottom = viewportTop + $(window).height(); + + return elementTop + 300 < viewportBottom + }; + + $(window).on('resize', function() { + //브라우저 크기 확인 실시 + var windowHeight = $(window).height(); //요소의 높이를 반환 + if(windowHeight < 440) { + $('#btn-scroll').removeClass("btn-scroll-fix"); + $('#btn-scroll').addClass("btn-scroll-hide"); + }else { + $('#btn-scroll').addClass("btn-scroll-fix"); + $('#btn-scroll').removeClass("btn-scroll-hide"); + } + }); + + $(window).on('scroll', function() { + // scroll 숨기기 + var $window = $(window); + var $document = $(document); + var $footer = $("#footer"); + + if ($window.scrollTop() < $document.height() - $window.height() - $footer.outerHeight() + 100) { + $('#btn-scroll').addClass("btn-scroll-fix"); + $('#btn-scroll').removeClass("btn-scroll-hide"); + } else { + $('#btn-scroll').removeClass("btn-scroll-fix"); + $('#btn-scroll').addClass("btn-scroll-hide"); + } + + // 스크롤 할때마다 다음 section값으로 수정 + $('.sec').each(function(index, item){ + if ($(item).isInViewport()) { + var seq = index+2; + if(seq == 8) { + $('#btn-scroll').removeClass("btn-scroll-fix"); + $('#btn-scroll').addClass("btn-scroll-hide"); + $('#btn-scroll').attr('onclick',''); + return false; + } + $('#btn-scroll').attr('onclick','fn_Move('+seq+')'); +// return false; + } + }); + + }); }); +function fn_Move(seq) { + var interval = 100; + var offset = $("#sec" + seq).offset(); + if(seq > 3) interval = 250; + $('html, body').animate({ + scrollTop: offset.top - interval + }, 300); + return false; +} + function fn_search(keyword) { var form = document.createElement("form"); form.style.display = "none"; @@ -93,9 +157,9 @@ function fn_listPops(typeDivCd) { } - + -
    +

    배너 섹션영역

    - -
    + + +
    +

    검색

    +
    +
    + +
    + 검색 +
    + + +
    +
    + + + +
    +
    +
    +
    + +
    이용안내
     - -
    찾아오시는 길
    +     +
    관심자료
     @@ -180,27 +268,8 @@ function fn_listPops(typeDivCd) {
    - -
    -

    키워드 섹션영역

    -
    -
    -

    AI 추천 키워드

    -

    어떤 자료들을 소장 중인지 키워드로 살펴보세요!

    -
      - -
    • # -
      • -       -
    -
    -
    -
    -     - - -
    +

    문화원픽 섹션영역

    @@ -242,21 +311,11 @@ function fn_listPops(typeDivCd) {
    - - -
    -

    중간배너 섹션영역

    -
    -
    -

    회원가입만 하면 발급되는
    간편 온라인 회원증!

    -

    문화원 소장자료관 회원가입 시 해당 문화원에서
    사용할 수 있는 온라인 회원증이 발급됩니다.

    -
    -
    -
    - - + + + -
    +

    인기자료 섹션영역

    인기 자료

    @@ -297,9 +356,9 @@ function fn_listPops(typeDivCd) {
    - + -
    +

    온라인자료관 섹션영역

    온라인 자료관

    @@ -348,8 +407,27 @@ function fn_listPops(typeDivCd) {
    - -
    + + +
    +

    키워드 섹션영역

    +
    +
    +

    AI 추천 키워드

    +

    어떤 자료들을 소장 중인지 키워드로 살펴보세요!

    +
      + +
    • # +
      • +       +
    +
    +
    +
    +     + + +

    커뮤니티 섹션영역

    @@ -399,7 +477,17 @@ function fn_listPops(typeDivCd) {
    - + + +
    +

    중간배너 섹션영역

    +
    +
    +

    회원가입만 하면 발급되는
    간편 온라인 회원증!

    +

    문화원 소장자료관 회원가입 시 해당 문화원에서
    사용할 수 있는 온라인 회원증이 발급됩니다.

    +
    +
    +
    diff --git a/src/main/webapp/WEB-INF/tiles/inc/footer.jsp b/src/main/webapp/WEB-INF/tiles/inc/footer.jsp index 61be1e3f..6915468c 100644 --- a/src/main/webapp/WEB-INF/tiles/inc/footer.jsp +++ b/src/main/webapp/WEB-INF/tiles/inc/footer.jsp @@ -1,76 +1,76 @@ -<%@ 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"%> - - - -
    -
    - -
    -

    관련 사이트

    -
    - - - - - - - - -
    -
    -
    -

    지방문화원 소장자료관

    -
    -
    -
    -
    -
    -
    -
    -
    -
    -
    - -

    - 서울시 마포대로49 성우빌딩 308호 TEL. 02.704-2322 FAX. 02.704-2377
    - COPYRIGHT (C)2018 The Federation of Korea Culture Center. ALL RIGHT RESERVED. -

    -
    -
    -
    +<%@ 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"%> + + + +
    +
    + +
    +

    관련 사이트

    +
    + + + + + + + + +
    +
    +
    +

    지방문화원 소장자료관

    +
    +
    +
    +
    +
    +
    +
    +
    +
    +
    + +

    + 서울시 마포대로49 성우빌딩 308호 TEL. 02.704-2322 FAX. 02.704-2377
    + COPYRIGHT (C)2018 The Federation of Korea Culture Center. ALL RIGHT RESERVED. +

    +
    +
    +
    \ No newline at end of file diff --git a/src/main/webapp/WEB-INF/tiles/inc/menu.jsp b/src/main/webapp/WEB-INF/tiles/inc/menu.jsp index e3e21c20..d586e7b6 100644 --- a/src/main/webapp/WEB-INF/tiles/inc/menu.jsp +++ b/src/main/webapp/WEB-INF/tiles/inc/menu.jsp @@ -18,7 +18,9 @@