Merge branch 'master' of

http://docs.nculture.org:30000/nculture/iams.nlib

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

src/main/java/nlib/cmm/qrcode/QRCodeUtil.java

@@ -139,19 +139,8 @@ public class QRCodeUtil {
 			throw new Exception("QR 2D바코드로 생성에 필요한 이름 정보가 없습니다.");
 		}
 
-		// (1) "사용자고유번호;이메일;이름;" 형식으로 문자열을 구성
+		String barcodeText = loginVO.getMbInfoId();
-		String barcodeText = String.format("%s;%s;%s;"
+		return generateQRCodeImageByZxing(barcodeText);
-								, loginVO.getMbInfoId()
-								, loginVO.getEmail()
-								, loginVO.getName());
-		log.debug("generateMemberQRCodeImage : barcodeText=" + barcodeText);
-		
-		// (2) 앞의 (1)의 문자열을 암호화 처리 
-		String cryptedBarcodeText = EgovFileScrty.encodeBinary(barcodeText.getBytes());
-		log.debug("generateMemberQRCodeImage : cryptedBarcodeText=" + cryptedBarcodeText);
-		
-		// (3) 앞의 (2) 암호화 문자열로 QRCode 생성하여  BufferedImage형식으로 리턴 
-		return generateQRCodeImageByZxing(cryptedBarcodeText);
 	}
 	
 	/**

src/main/resources/egovframework/mapper/nlib/cmm/MainDAO_SQL.xml

@@ -30,7 +30,7 @@
         ) T
         GROUP BY T.KEY_NAME
         ORDER BY CNT DESC, T.KEY_NAME
-        LIMIT 30
+        LIMIT 20
 		]]>
  	</select>
  	

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

@@ -62,6 +62,9 @@ $( document ).ready(function() {
 
      var $qObj = $(qObj);
      if($qObj.hasClass('on')) {
+    	 $qObj.removeClass("on");
+    	 $qObj.next(".answer").stop().slideUp(300);
+    	 $qObj.next(".answer").html("");
     	 return;
      }
      
@@ -170,6 +173,7 @@ $( document ).ready(function() {
              $.each(jsonObj.data,function(key,obj) {
                  var li = $(document.createElement('li'));
                  li.attr("articleId", obj.articleId);
+                 
                  li.append($('<button type="button"></button>').attr('class', 'question').on("click", function() {
                      fn_viewDetail(this, obj.articleId);
                  }));

src/main/webapp/WEB-INF/jsp/nlib/cmm/home.jsp

@@ -138,34 +138,34 @@ function fn_listPops(typeDivCd) {
 			</div>
 			
             <div class="color-box">
-                <div class="list">
+                <button class="list">
                     <a href="javascript:void(0);" onclick="location.href = '/inform/selectNCultureOperationInfo.do';" title="이용안내">
                     <div class="title">이용안내</div>
                     <div class="icon"><img src="/images/icon/icon-sec1-01.png" alt=""></div>
                     <div class="open"><img src="/images/icon/icon-plus.png" alt=""></div>
                     </a>
-                </div>
+                </button>
-                <div class="list">
+                <button class="list">
                     <a href="javascript:void(0);" onclick="gfn_gotoUrl('/inform/selectNCultureLocationInfo.do')" title="찾아오시는 길">
                     <div class="title">찾아오시는 길</div>
                     <div class="icon"><img src="/images/icon/icon-sec1-02.png" alt=""></div>
                     <div class="open"><img src="/images/icon/icon-plus.png" alt=""></div>
                     </a>
-                </div>
+                </button>
-                <div class="list">
+                <button class="list">
                     <a href="javascript:void(0);" onclick="location.href = '/rent/listRentItems.do';" title="대출관리">
                     <div class="title">대출관리</div>
                     <div class="icon"><img src="/images/icon/icon-sec1-03.png" alt=""></div>
                     <div class="open"><img src="/images/icon/icon-plus.png" alt=""></div>
                     </a>
-                </div>
+                </button>
-                <div class="list">
+                <button class="list">
                     <a href="javascript:void(0);" onclick="location.href = '/read/listReadItems.do';" title="열람관리">
                     <div class="title">열람관리</div>
                     <div class="icon"><img src="/images/icon/icon-sec1-04.png" alt=""></div>
                     <div class="open"><img src="/images/icon/icon-plus.png" alt=""></div>
                     </a>
-                </div>
+                </button>
             </div>
         </div>
     </section>

src/main/webapp/WEB-INF/jsp/nlib/collection/searchList.jsp

@@ -68,6 +68,9 @@ window.onload = function() {
         fn_search_article(1);
     });
     
+    // 탭 액티브 중복 방지
+    $(".tab ul.tabs").removeClass("active").find("> li:eq(0)").removeClass("current");
+    
     $("#referencelistForm input:checkbox[name='reQueryChk']").on('change', function() {
          if ( $(this).prop('checked') )
          {
@@ -436,16 +439,16 @@ function fn_search_article(pageIndex) {
                                                         <div class="t-data">
                                                             <div class="img"><a href="javascript:void(0)"><img src="${result.rprsThumbUrlWithDefaultSmall }" alt="썸네일" width="60" height="91" title="상세보기" onclick="goDetail('${result.masterId}');"></a>
                                                                       <c:if test='${result.MUseYn == "Y"}'>
-                                                                          <span id="favorites_${result.masterId}" class="favorites" onclick="fn_changeInterest('${result.masterId }', 'off')" title="관심자료에서 삭제합니다.">
+                                                                          <button id="favorites_${result.masterId}" class="favorites" onclick="fn_changeInterest('${result.masterId }', 'off')" title="관심자료에서 삭제합니다.">
                                                                           <img src="/images/icon/icon-cart-Favorites-on.png" class="off" alt="즐겨찾기 아이콘">
                                                                           <img src="/images/icon/icon-cart-Favorites.png" class="on" alt="즐겨찾기 아이콘">
-                                                                          </span>
+                                                                          </button>
                                                                       </c:if>
                                                                       <c:if test='${result.MUseYn != "Y"}'>
-                                                                          <span id="favorites_${result.masterId}" class="favorites" onclick="fn_changeInterest('${result.masterId }', 'on')" title="관심자료로 등록합니다.">
+                                                                          <button id="favorites_${result.masterId}" class="favorites" onclick="fn_changeInterest('${result.masterId }', 'on')" title="관심자료로 등록합니다.">
                                                                           <img src="/images/icon/icon-cart-Favorites.png" class="off" alt="즐겨찾기 아이콘">
                                                                           <img src="/images/icon/icon-cart-Favorites-on.png" class="on" alt="즐겨찾기 아이콘">
-                                                                          </span>
+                                                                          </button>
                                                                       </c:if>
                                                             </div>
                                                             <div class="type">
@@ -491,7 +494,7 @@ function fn_search_article(pageIndex) {
                                                                </c:if>
                                                                </p>
                                                             <c:if test="${result.ableOnline eq true}">
-                                                               <button type="button" class="btn-color" onclick="gfn_showDocPdf('${result.interfaceId}','${result.masterId}','${result.typeDivCd}','${result.dtlsTypeDivCd}')";>원문보기</button>
+                                                               <button type="button" class="btn-color" title="새창열기"  onclick="gfn_showDocPdf('${result.interfaceId}','${result.masterId}','${result.typeDivCd}','${result.dtlsTypeDivCd}')";>원문보기</button>
                                                             </c:if>
                                                             <button type="button" class="btn-gray" onclick="risShow('${result.masterId}');">RIS</button>
                                                         </div>

src/main/webapp/css/common.css

@@ -1,6 +1,6 @@
 @charset "utf-8";
 
-*{padding:0;margin:0;}
+*{padding:0;margin:0;outline:0px solid #ccc;}
 html,body{width:100%;height:100%;}
 html{}
 body{ font-family:'Noto Sans KR', 'Noto Sans', sans-serif;letter-spacing:-0.1px;font-weight:200;color:#333;word-break:keep-all;}
@@ -28,7 +28,7 @@ table{border:none;border-collapse:collapse;padding:0;border-spacing:0;border-col
 a{text-decoration:none;color:#333;}
 a:link,a:visited,a:active,a:focus{text-decoration:none;}
 a:hover{text-decoration:none;}
-input {border:0;}
+input {border:0;outline:0;}
 strong {font-weight:500;}
 h3 {font-weight: 500;}
 .eff {