Merge remote-tracking branch 'origin/master'

Conflicts:
	src/main/webapp/css/media.css

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();
 	}