팝업 템플릿 퍼블 구성중

src/main/java/nlib/info/service/impl/InformServiceImpl.java

@@ -112,6 +112,7 @@ public class InformServiceImpl implements InformService
 		//-----------------------------
 		// 전체 문화원 공통 사항 
 		//-----------------------------
+		// 대출안내
 		HashMap<String, String> operation1 = selectInfoContent(NlibProperty.getString("nlib.council.cd"), "OPERATION1");
 		if(envValues != null && operation1 != null && operation1.get("CONTENT") != null) {
 			String content = operation1.get("CONTENT");
@@ -121,12 +122,16 @@ public class InformServiceImpl implements InformService
 			operation1.put("CONTENT", content);
 		}
 		
+		// 반납안내
 		HashMap<String, String> operation2 = selectInfoContent(NlibProperty.getString("nlib.council.cd"), "OPERATION2");
+		
+		// 열람안내
 		HashMap<String, String> operation3 = selectInfoContent(NlibProperty.getString("nlib.council.cd"), "OPERATION3");
 		
 		//-----------------------------
 		// 해당 문화원 특정 사항 
 		//-----------------------------
+		// 온라인열람서비스
 		HashMap<String, String> operation4 = selectInfoContent(councilCd, "OPERATION4");
 		
 		operationInfo.put("OPERATION1", operation1);

src/main/java/nlib/security/SpringSecurityConfig.java

@@ -89,6 +89,7 @@ public class SpringSecurityConfig extends WebSecurityConfigurerAdapter {
 			.antMatchers("/homes/**").permitAll()
 			.antMatchers("/cart/**").permitAll()
 			.antMatchers("/bbs/**").permitAll()
+			.antMatchers("/search/**").permitAll()
 			.antMatchers("/*.html").permitAll()
 			.anyRequest().authenticated()
 		.and().formLogin()

src/main/webapp/WEB-INF/jsp/nlib/inform/selectNCultureOperationInfo.jsp

@@ -108,41 +108,7 @@ $( document ).ready(function() {
                     <div class="info-box">
                         <div class="info-sec">
                             <h3><span>자료대출</span> 안내</h3>
-                            <div class="text-box">
+                            ${informContent1 }
-                                <p>
-                                    <span>대상 : </span>
-                                    <span>문화원 소장자료관 회원 (온라인 회원증 소지자)</span>
-                                </p>
-                                <p>
-                                    <span>대출기간 : </span>
-                                    <span>14일</span>
-                                </p>
-                                <p>
-                                    <span>대출 자료 수 : </span>
-                                    <span>1인 5개</span>
-                                </p>
-                                <p>
-                                    <span>이용가능 시간 안내 : </span>
-                                    <span>문화원 운영시간 내 (이용시간 및 휴관일 참조)</span>
-                                </p>
-                                <p>
-                                    <span>대출 신청 안내 : </span><br>
-                                    <span>
-                                        대출가능 자료 중 이용중인 사람이 없는 자료의 경우, [대출신청]이 가능합니다.<br>
-                                        방법 1) ‘소장자료’ 메뉴에서 자료 검색 → 원하는 자료 선택 → [대출신청] 클릭<br>
-                                        방법 2) ‘소장자료’ 메뉴에서 자료 검색 → 원하는 자료들 카트 담기 → ‘카트’ 메뉴에서 대출할 자료 선택 → [대출신청/예약] 클릭<br>
-                                    </span>
-                                </p>
-                                <p>
-                                    <span>대출 신청 안내 : </span><br>
-                                    <span>
-                                        대출가능 자료 중 현재 대출중인 이용자는 있으나 대기자가 없는 자료의 경우, [대출예약]이 가능합니다.<br>
-                                        반납된 자료는 3일간 별도 보관되며, 3일이 지나면 예약이 취소됩니다.<br>
-                                        방법 1) ‘소장자료’ 메뉴에서 자료 검색 → 원하는 자료 선택 → [대출예약] 클릭<br>
-                                        방법 2) ‘소장자료’ 메뉴에서 자료 검색 → 원하는 자료들 카트 담기 → ‘카트’ 메뉴에서 대출예약 할 자료 선택 → [대출신청/예약] 클릭<br>
-                                    </span>
-                                </p>
-                            </div>
                         </div>
                         <div class="info-sec">
                             <h3><span>자료열람</span> 안내</h3>
@@ -171,6 +137,7 @@ $( document ).ready(function() {
                         </div>
                         <div class="info-sec">
                             <h3><span>반납지연(연체)</span> 안내</h3>
+                            ${informContent2 }
                             <div class="text-box">
                                 <p>
                                     <span></span>
@@ -198,29 +165,6 @@ $( document ).ready(function() {
     </section>
 
 
-<c:set var="pageTitle">이용안내 </c:set>
-
-<!DOCTYPE html>
-<html>
-<head>
-<title>${pageTitle}</title>
-</head>
-<body>
-
-<h1>${pageTitle }</h1>
-
-<br>
-대출안내
-<div id="informContent" name="informContent" style="width: 100%; border:1px solid gray;">
-${informContent1 }
-</div>
-
-<br>
-반납안내 
-<div id="informContent" name="informContent" style="width: 100%; border:1px solid gray;">
-${informContent2 }
-</div>
-
 <br>
 열람안내 
 <div id="informContent" name="informContent" style="width: 100%; border:1px solid gray;">

src/main/webapp/WEB-INF/jsp/nlib/search/getDetailedSearchFormPopup.jsp

@@ -32,18 +32,14 @@
 <%@ taglib prefix="validator" uri="http://www.springmodules.org/tags/commons-validator" %>
 <c:set var="pageTitle">상세 검색</c:set>
 
-<!DOCTYPE html>
+<script>
-<html>
+$(document).ready(function() {
-<head>
+    // $('.pop-advanced-search').fadeIn();
-<title>${pageTitle}</title>
+    // $('html,body').addClass('no-scroll');
-<meta http-equiv="content-type" content="text/html; charset=utf-8">
+});
-<script type="text/javaScript" language="javascript">
-
 </script>
-</head>
 
-<body>
+    <div class="popup pop-advanced-search" style="display:none;">
-<div class="popup pop-advanced-search" style="display:none;">
         <div class="pop-wrap">
             <div class="Title">
                 <span>상세 검색</span>
@@ -314,6 +310,3 @@
             </form>
         </div>
     </div>
-
-</body>
-</html>

src/main/webapp/WEB-INF/tiles/inc-popup/menu-popup.jsp

@@ -1,4 +1,5 @@
 <%@ page contentType="text/html; charset=utf-8" pageEncoding="utf-8"%>
 <%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ taglib prefix="spring" uri="http://www.springframework.org/tags"%>
-<a href="javascript:void(0);" onclick="fn_closeLayerPopup()" class="floatRight">닫기</a>
+
+<!-- <a href="javascript:void(0);" onclick="fn_closeLayerPopup()" class="floatRight">닫기</a> -->

src/main/webapp/WEB-INF/tiles/inc/header.jsp

@@ -28,7 +28,8 @@ String councilNm = (String)session.getAttribute("councilNm");
                         <div class="search-input">
                             <input type="text" placeholder="" title="검색어 입력" name="query" id="query" class="ark_query" value="" autocomplete="off">
                             <button type="button" class="btn-search" id="searchHeaderButton"><span>검색</span></button>
-                            <button type="button" class="btn-search-detail" id="btn-search-detail-cl" onclick="javascript:fn_layerPop('${pageContext.request.contextPath}/search/getDetailedSearchFormPopup.do');">상세검색</button>
+                            <!-- <button type="button" class="btn-search-detail" id="btn-search-detail-cl" onclick="javascript:fn_layerPop('${pageContext.request.contextPath}/search/getDetailedSearchFormPopup.do');">상세검색</button> -->
+                            <button type="button" class="btn-search-detail" id="btn-search-detail-cl">상세검색</button>
                         </div> 
                         <div class="condition_sear">
                             <select name="searchField" id="searchField1" class="sear_depth">
@@ -67,4 +68,6 @@ String councilNm = (String)session.getAttribute("councilNm");
             </div>
         </div>
 
+        <script>
         
+        </script>

src/main/webapp/WEB-INF/tiles/tiles-layout-popup.jsp

@@ -7,27 +7,45 @@
 <!DOCTYPE html>
 <html lang="ko">
 <head>
+<meta charset="utf-8">
+<meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
-<link href="<c:url value='/css/nlib.css' />" rel="stylesheet" type="text/css">
+<meta name="viewport" content="width=device-width, initial-scale=1.0">
-<title>온라인 자료대출관리 (N-LIB)</title>
+<meta name="format-detection" content="telephone=no" />
+
+<link rel="shortcut icon" type="image/x-icon" href="#">
+<link href="${pageContext.request.contextPath}/css/common.css" rel="stylesheet">
+<link href="${pageContext.request.contextPath}/css/jquery.mCustomScrollbar.css" rel="stylesheet">
+<link href="${pageContext.request.contextPath}/css/swiper.min.css" rel="stylesheet">
+<link href="${pageContext.request.contextPath}/css/default.css" rel="stylesheet">
+
+<script src="${pageContext.request.contextPath}/js/jquery-1.11.2.min.js"></script>
+<script src="${pageContext.request.contextPath}/js/jquery.mCustomScrollbar.js"></script>
+<script src="${pageContext.request.contextPath}/js/swiper.min.js"></script>
+<script src="${pageContext.request.contextPath}/js/default.js"></script>
+
+<script src="${pageContext.request.contextPath}/js/nlib.js"></script>
+
+<title>소장자료관</title>
 
 <script type="text/javascript">
-
+// 제목 설정 
-//제목 설정 
+function fn_setPageTitle(title) {
-$( document ).ready(function() {
+    document.title = "소장자료관 - " + title;
-    document.title = "[NLIB] " + $("#content-wrap-popup").find("title").text();
+}
-});  
-
 </script>
+    
 </head>
 <body>
-<div id="page-container">
-<div id="header-popup"><tiles:insertAttribute name="header" /></div>
-<div id="menu-popup"><tiles:insertAttribute name="menu" /></div>
-<div id="content-wrap-popup"><tiles:insertAttribute name="main" /></div>
-<div id="footer-popup"><tiles:insertAttribute name="footer" /></div>
-</div>
 
+<div class="wrap sub">
+
+    <tiles:insertAttribute name="header" />
+    <tiles:insertAttribute name="menu" />
+    <tiles:insertAttribute name="main" />
+    <tiles:insertAttribute name="footer" />
+
+</div>
 
 </body>
 </html>

src/main/webapp/WEB-INF/tiles/tiles-layout.jsp

@@ -59,7 +59,8 @@ function fn_setPageTitle(title) {
 </div>
 
 <!-- Layer Popup -->
-<div id="NLIB_LAYER_POPUP" style="z-index:100; display:none; margin-left:20px !important; position:fixed; top:100px;left:20%; width:500px; height:auto; min-height:200px; max-height:500px; border:3px solid black !important; overflow:scroll; background-color:#eeeeaa; "></div>
+<div id="NLIB_LAYER_POPUP" name="NLIB_LAYER_POPUP" class="popup pop-advanced-search" style="display:none;">
+</div>
 
 </body>
 </html>

src/main/webapp/js/default.js

@@ -387,8 +387,9 @@ $(document).ready(function(){
 
         // 상세검색 팝업 열기
         $('.btn-search-detail').on('click', function () {
-            $('.pop-advanced-search').fadeIn();
+            //$('.pop-advanced-search').fadeIn();
-            $('html,body').addClass('no-scroll');
+            //$('html,body').addClass('no-scroll');
+            fn_layerPop('${pageContext.request.contextPath}/search/getDetailedSearchFormPopup.do');
         });
 
         //팝업닫기버튼 클릭

src/main/webapp/js/nlib.js

@@ -103,6 +103,9 @@ function fn_myAlert(newAlertNum) {
 function fn_layerPop(url) {
     $("#NLIB_LAYER_POPUP").load(url);
     $("#NLIB_LAYER_POPUP").show();
+
+    $('.pop-advanced-search').fadeIn();
+    $('html,body').addClass('no-scroll');
 }
 
 function fn_showLayerPop() {