From bfdb44324f2c2590228e4b41699fa56ec88af83c Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Fri, 4 Jan 2019 17:46:02 +0900
Subject: [PATCH] =?UTF-8?q?=EC=9D=BC=EB=B6=80=20=EC=BD=94=EB=93=9C=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 theme/54/skin/board/basic/view.skin.php      |  4 +-
 theme/54/skin/popular/basic/popular.skin.php | 47 +++++++++++++++++---
 theme/54/skin/popular/basic/style.css        |  5 ++-
 theme/54/skin/search/basic/search.skin.php   |  2 +-
 4 files changed, 46 insertions(+), 12 deletions(-)

diff --git a/theme/54/skin/board/basic/view.skin.php b/theme/54/skin/board/basic/view.skin.php
index 09ead2ffc..7e9bab2a3 100644
--- a/theme/54/skin/board/basic/view.skin.php
+++ b/theme/54/skin/board/basic/view.skin.php
@@ -45,8 +45,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
 	            <?php if ($write_href) { ?><li><a href="<?php echo $write_href ?>" class="btn_b01 btn" title="글쓰기"><i class="fa fa-pencil" aria-hidden="true"></i><span class="sound_only">글쓰기</span></a></li><?php } ?>
 	        	<?php if($update_href || $delete_href || $copy_href || $move_href || $search_href) { ?>
 	        	<li>
-	        		<button type="button" class="btn_more_opt btn_b01 btn"><i class="fa fa-ellipsis-v" aria-hidden="true"></i><span class="sound_only">게시판 리스트 옵션</span></button>
-		        	<ul class="more_opt"> 
+	        		<button type="button" class="btn_more_opt is_view_btn btn_b01 btn"><i class="fa fa-ellipsis-v" aria-hidden="true"></i><span class="sound_only">게시판 리스트 옵션</span></button>
+		        	<ul class="more_opt is_view_btn"> 
 			            <?php if ($update_href) { ?><li><a href="<?php echo $update_href ?>">수정<i class="fa fa-pencil-square-o" aria-hidden="true"></i></a></li><?php } ?>
 			            <?php if ($delete_href) { ?><li><a href="<?php echo $delete_href ?>" onclick="del(this.href); return false;">삭제<i class="fa fa-trash-o" aria-hidden="true"></i></a></li><?php } ?>
 			            <?php if ($copy_href) { ?><li><a href="<?php echo $copy_href ?>" onclick="board_move(this.href); return false;">복사<i class="fa fa-files-o" aria-hidden="true"></i></a></li><?php } ?>
diff --git a/theme/54/skin/popular/basic/popular.skin.php b/theme/54/skin/popular/basic/popular.skin.php
index 26c4ee7b9..bd1d1219a 100644
--- a/theme/54/skin/popular/basic/popular.skin.php
+++ b/theme/54/skin/popular/basic/popular.skin.php
@@ -3,7 +3,8 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
 
 // add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
 add_stylesheet('<link rel="stylesheet" href="'.$popular_skin_url.'/style.css">', 0);
-add_javascript('<script src="'.G5_JS_URL.'/jquery.bxslider.js"></script>', 10);
+add_javascript('<script src="'.G5_JS_URL.'/owlcarousel/owl.carousel.min.js"></script>', 10);
+add_stylesheet('<link rel="stylesheet" href="'.G5_JS_URL.'/owlcarousel/owl.carousel.min.css">', 10);
 ?>
 
 <!-- 인기검색어 시작 { -->
@@ -15,23 +16,55 @@ add_javascript('<script src="'.G5_JS_URL.'/jquery.bxslider.js"></script>', 10);
 	    if( isset($list) && is_array($list) ){
 	        for ($i=0; $i<count($list); $i++) {
 	        ?>
-	        <li><a href="<?php echo G5_BBS_URL ?>/search.php?sfl=wr_subject&amp;sop=and&amp;stx=<?php echo urlencode($list[$i]['pp_word']) ?>"><?php echo get_text($list[$i]['pp_word']); ?></a></li>
+	        <li class="item"><a href="<?php echo G5_BBS_URL ?>/search.php?sfl=wr_subject&amp;sop=and&amp;stx=<?php echo urlencode($list[$i]['pp_word']) ?>"><?php echo get_text($list[$i]['pp_word']); ?></a></li>
 	        <?php
 	        }   //end for
 	    }   //end if
 	    ?>
 	    </ul>
+        <span class="popular_btns">
+            <a href="#" class="pp-next"><i class="fa fa-angle-right" aria-hidden="true"></i></a>
+            <a href="#" class="pp-prev"><i class="fa fa-angle-left" aria-hidden="true"></i></a>
+        </span>
     </div>
 </section>
 
 <?php if (count($list)) { //게시물이 있다면 ?>
 <script>
-    $('.popular_inner ul').bxSlider({
-        hideControlOnEnd: true,
-        pager:false,
-        nextText: '<i class="fa fa-angle-right" aria-hidden="true"></i>',
-        prevText: '<i class="fa fa-angle-left" aria-hidden="true"></i>'
+jQuery(function($){
+    
+    var popular_el = ".popular_inner ul",
+        p_width = $(popular_el).width(),
+        c_width = 0;
+
+    $(popular_el).children().each(function() {
+        c_width += $(this).outerWidth( true );
     });
+
+    if( c_width > p_width ){
+        var $popular_btns = $(".popular_inner .popular_btns");
+        $popular_btns.show();
+
+        var p_carousel = $(popular_el).addClass("owl-carousel").owlCarousel({
+            items:5,
+            loop:true,
+            nav:false,
+            dots:false,
+            autoWidth:true,
+            mouseDrag:false,
+        });
+
+        $popular_btns.on("click", ".pp-next", function(e) {
+            e.preventDefault();
+            p_carousel.trigger('next.owl.carousel');
+        })
+        .on("click", ".pp-prev", function(e) {
+            e.preventDefault();
+            p_carousel.trigger('prev.owl.carousel');
+        });
+    }
+
+});
 </script>
 <?php } ?>
 <!-- } 인기검색어 끝 -->
\ No newline at end of file
diff --git a/theme/54/skin/popular/basic/style.css b/theme/54/skin/popular/basic/style.css
index 26e931ad1..29d6ae6d0 100644
--- a/theme/54/skin/popular/basic/style.css
+++ b/theme/54/skin/popular/basic/style.css
@@ -11,5 +11,6 @@
 #popular li:first-child {border-left:0}
 #popular li a:hover {text-decoration:underline}
 
-#popular .bx-next {position:absolute;top:68%;right:0px;width:18px;height:18px;line-height:15px;text-align:center;border:1px solid #53555a;margin-top:-12px;color:#d3d2d2}
-#popular .bx-prev {position:absolute;top:68%;right:17px;width:18px;height:18px;line-height:15px;text-align:center;border:1px solid #53555a;margin-top:-12px;color:#d3d2d2}
+.popular_inner .popular_btns{display:none}
+.popular_btns .pp-next {position:absolute;top:68%;right:0px;width:18px;height:18px;line-height:15px;text-align:center;border:1px solid #53555a;margin-top:-12px;color:#d3d2d2}
+.popular_btns .pp-prev {position:absolute;top:68%;right:17px;width:18px;height:18px;line-height:15px;text-align:center;border:1px solid #53555a;margin-top:-12px;color:#d3d2d2}
diff --git a/theme/54/skin/search/basic/search.skin.php b/theme/54/skin/search/basic/search.skin.php
index aa19f6b90..008edf7e4 100644
--- a/theme/54/skin/search/basic/search.skin.php
+++ b/theme/54/skin/search/basic/search.skin.php
@@ -105,7 +105,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$search_skin_url.'/style.css">',
     $k=0;
     for ($idx=$table_index, $k=0; $idx<count($search_table) && $k<$rows; $idx++) {
      ?>
-        <h2><a href="./board.php?bo_table=<?php echo $search_table[$idx] ?>&amp;<?php echo $search_query ?>"><?php echo $bo_subject[$idx] ?> 게시판 내 결과</a></h2>
+        <h2><a href="<?php echo get_pretty_url($search_table[$idx], '', $search_query); ?>"><?php echo $bo_subject[$idx] ?> 게시판 내 결과</a></h2>
         <ul>
         <?php
         for ($i=0; $i<count($list[$idx]) && $k<$rows; $i++, $k++) {