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

@@ -36,7 +36,7 @@
 <script>
  
  $( document ).ready(function() {
-	 
+
 	 // 메시지 표출 
      if(!fn_isEmpty('${message}')) {
          alert("${message}");
@@ -155,6 +155,7 @@
  }
  
  </script>
+ 
 
     <!-- 공지사항 섹션 -->
     <div class="location noti-data">

src/main/webapp/js/default.js

@@ -185,12 +185,21 @@ $(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();
 		$('.nav-wrap').show();
 	});
-    
+		
 	/* 메인 메뉴 반응형 */
     jQuery(function ($) {
         $.fn.responsivenav = function (args) {