Merge remote-tracking branch 'origin/master'

src/main/java/nlib/col/service/CollectionVO.java

@@ -161,7 +161,40 @@ public class CollectionVO extends PagingVO {
 	//---------------------------------------------
 	protected String deptNm;		/* 관리부서이름 */
 	protected String domainHostNm;	/* 관리부서 호스트주소 */
+	
+
+	//---------------------------------------------
+	// 각종 상태 제공 서비스 
+	//---------------------------------------------
+	public boolean canRead() {
+		return true;
+	}
+	public boolean canRent() {
+		return true;
+	}
+	public boolean canOnline() {
+		return true;
+	}
+	
+	public boolean canReadNow() {
+		return true;
+	}
+	public boolean canRentNow() {
+		return canRentAppNow() || canRentResNow();
+	}
+	public boolean canRentAppNow() {
+		return true;
+	}
+	public boolean canRentResNow() {
+		return true;
+	}
+	public boolean canOnlineNow() {
+		return true;
+	}
+	
+	//---------------------------------------------
 	// 생성자
+	//---------------------------------------------
 	public CollectionVO() {
 		super();
 	}

src/main/resources/egovframework/egovProps/globals.properties

@@ -30,7 +30,7 @@ Globals.DbType = maria
 # > grant all privileges on uac_cltr_db.* to 'uac_cltr';
 # > flush privileges;
 Globals.maria.DriverClassName=org.mariadb.jdbc.Driver
-Globals.maria.Url=jdbc:mariadb://nlib-db.nculture.org:3306/uac_cltr_db
+Globals.maria.Url=jdbc:mariadb://210.181.197.70:3306/uac_cltr_db
 Globals.maria.UserName = uac_cltr
 Globals.maria.Password = uac_cltr
 

src/main/webapp/WEB-INF/jsp/nlib/bbs/listAncmnts.jsp

@@ -156,6 +156,7 @@
  
  </script>
  
+
     <!-- 공지사항 섹션 -->
     <div class="location noti-data">
         <h2 class="blind">공지사항 섹션영역</h2>

src/main/webapp/css/default.css

@@ -850,7 +850,7 @@ transform: rotate(45deg);}
 .data .inner .data-box .culture-box .tab .title .list-search-wrap > div.list-input {height:36px;line-height: 36px;border:1px solid #ddd;color:#666;padding:0px 40px 0px 10px;vertical-align: top;border-radius: 3px;position: relative;}
 .data .inner .data-box .culture-box .tab .title .list-search-wrap > div.list-input input::placeholder {font-size:12px;color:#999;font-weight: 500;}
 .data .inner .data-box .culture-box .tab .title .list-search-wrap > div.list-input button {background: url(/images/icon/icon-data-search.png) no-repeat center;text-indent: -9999999px;width:36px;height:36px;vertical-align: top;position: absolute;top:0px;right:0px;}
-
+.data .inner .data-box .culture-box .tab .title .list-search-wrap > div.list-input button.filter-btn {display:none;}
 
 /********** 소장자료 상세페이지 **********/
 .data.detail {width:100%;}
@@ -868,13 +868,14 @@ transform: rotate(45deg);}
 .data.detail .inner .row-top .center .left .cla .con-2 {display: inline-block;padding:0px 0px 0px 10px;}
 .data.detail .inner .row-top .center .left .cla .con-2 .code {font-size:16px;color:#fff;line-height: 26px;}
 .data.detail .inner .row-top .center .left .tit {font-size:30px;color:#fff;font-weight: 500;margin-bottom:20px;}
-.data.detail .inner .row-top .center .left .img {background:#fff;display: inline-block;}
+.data.detail .inner .row-top .center .left .img {background:#fff;display: inline-block;width:100%;height:445px;display: flex;align-items: center;justify-content: center;}
 .data.detail .inner .row-top .center .right .con-1 {display: inline-block;width:100%;height:100px;border-bottom:1px solid #ddd;text-align: right;margin-bottom: 30px;}
 .data.detail .inner .row-top .center .right .con-1 button {background:#f5f5f5;width:auto;height:30px;line-height:28px;width:30px;border-radius: 3px;font-size:14px;color:#222;font-weight: 600;text-align: center;border:1px solid #ddd;margin-top:55px;}
 .data.detail .inner .row-top .center .right .con-1 button.view {width:auto;padding:0px 26px;}
 .data.detail .inner .row-top .center .right .con-1 button.ris {}
 .data.detail .inner .row-top .center .right .con-1 button.favorit {text-indent: -99999px;background:url(/images/icon/icon-data-star.png) no-repeat center #f5f5f5;}
 .data.detail .inner .row-top .center .right .con-1 button.share {text-indent: -99999px;background:url(/images/icon/icon-data-share.png) no-repeat center #f5f5f5;}
+ .data.detail .inner .row-top .center .right .con-1 button.original {width:200px;display:none;}
 .data.detail .inner .row-top .center .right .con-2 {}
 .data.detail .inner .row-top .center .right .con-2 .de-data {display: flex;}    
 .data.detail .inner .row-top .center .right .con-2 .de-data ul {width: 50%;display: flex;flex-direction: column;}   
@@ -899,7 +900,8 @@ transform: rotate(45deg);}
 .data.detail .inner .row-bottom .con-1 .text-box {display:inline-block;width:96%;padding:10px 2%;background:#f4f4f4;text-align: left;}
 .data.detail .inner .row-bottom .con-1 .text-box p {font-size:12px;}
 .data.detail .inner .row-bottom .con-2 {display:inline-block;width:100%;border-top:1px solid #333;border-bottom:1px solid #ddd;margin:0px 0px 100px;}
-.data.detail .inner .row-bottom .con-2 .top h3 {font-size:24px;text-align: center;} 
+.data.detail .inner .row-bottom .con-2 .top {position:relative;}
+.data.detail .inner .row-bottom .con-2 .top h3 {font-size:24px;text-align: center;height:60px;line-height:60px;} 
 .data.detail .inner .row-bottom .con-2 .top h3 span {color: #376795;}
 .data.detail .inner .row-bottom .con-2 .top .down-btn {position: absolute;top:0px;right:0px;text-indent: -999999px;background:url(/images/icon/icon-data-downarr2.png) no-repeat center;width:60px;height:60px;}
 .data.detail .inner .row-bottom .con-2 .top .down-btn.on {background:url(/images/icon/icon-data-downarr2-on.png) no-repeat center;}
@@ -1314,7 +1316,7 @@ transform: rotate(45deg);}
 .list-table-wrap li .t-status {width: 10%;}
 .list-table-wrap li .t-file {width:auto;}
 .list-table-wrap li .t-answer {width:auto;}
-.list-table-wrap .t-tit-line {width: 100%;border-top: 2px solid #000;border-bottom: 1px solid #000;color: #fff;font-size:12px;font-weight:400;background: #556676;}
+.list-table-wrap .t-tit-line {width: 100%;border-top: 2px solid #000;border-bottom: 1px solid #000;color: #fff;font-size:14px;font-weight:400;background: #556676;}
 .list-table-wrap .t-tit-line span {text-align: center;}
 .list-table-wrap li .message {width: 100%;text-align: center;}
 .list-table-wrap .t-status em {text-align: center;font-size: 14px;width: 82px;height: 30px;line-height: 30px;display: block;margin: 0 auto;border-radius: 15px;border: 1px solid #ddd;}
@@ -1992,7 +1994,7 @@ animation: animate-bg2 2.0s 1.9s ease-in infinite;
 .paging .btn-next {text-indent: 0px;width:70px;text-align:left;}
 .paging .btn a {font-size:12px;font-weight: 300;}
 
-
+.article-side .filter-wrap .Title {display:none;}
 
 
 

src/main/webapp/js/default.js

@@ -185,6 +185,15 @@ $(document).ready(function(){
 		$('.pop-change').fadeOut();
 	});
 	
+	// 필터 팝업
+    $('.filter-btn').click(function(){
+		$('.article-side').fadeIn();
+	});
+    // 닫기
+	$('.filter-close').on('click', function () {
+		$('.article-side').fadeOut();
+	});
+	
 	// 검색 닫기
 	$('.search-close').on('click', function () {
 		$('.search-wrap').hide();