g5 merge 충돌 수정

mobile/head.php

@@ -29,6 +29,84 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
             <a href="<?php echo G5_URL ?>"><img src="<?php echo G5_IMG_URL ?>/logo.jpg" alt="<?php echo $config['cf_title']; ?>"></a>
         </div>
 
+        <button type="button" id="hd_menu_open">메뉴<span class="sound_only"> 열기</span></button>
+
+        <div id="menu_wrap">
+            <ul>
+            <?php
+            $sql = " select *
+                        from {$g5['menu_table']}
+                        where me_mobile_use = '1'
+                          and length(me_code) = '2'
+                        order by me_order, me_id ";
+            $result = sql_query($sql);
+
+            for($i=0; $row=sql_fetch_array($result); $i++) {
+            ?>
+                <li>
+                    <a href="<?php echo $row['me_link']; ?>" target="_<?php echo $row['me_target']; ?>" class="gnb_1da"><?php echo $row['me_name'] ?></a>
+                    <?php
+                    $sql2 = " select *
+                                from {$g5['menu_table']}
+                                where me_mobile_use = '1'
+                                  and length(me_code) = '4'
+                                  and substring(me_code, 1, 2) = '{$row['me_code']}'
+                                order by me_order, me_id ";
+                    $result2 = sql_query($sql2);
+
+                    for ($k=0; $row2=sql_fetch_array($result2); $k++) {
+                        if($k == 0)
+                            echo '<ul class="gnb_2dul">'.PHP_EOL;
+                    ?>
+                        <li class="gnb_2dli"><a href="<?php echo $row2['me_link']; ?>" target="_<?php echo $row2['me_target']; ?>" class="gnb_2da"><?php echo $row2['me_name'] ?></a></li>
+                    <?php
+                    }
+
+                    if($k > 0)
+                        echo '</ul>'.PHP_EOL;
+                    ?>
+                </li>
+            <?php
+            }
+
+            if ($i == 0) {  ?><li class="gnb_empty">생성된 메뉴가 없습니다.</li><?php }
+            ?>
+            </ul>
+            <button type="button" id="hd_menu_close">닫기</button>
+        </div>
+        <script>
+        $(function() {
+            $("#hd_menu_open").click(function() {
+                var $menu = $("#menu_wrap");
+                var w = $menu.width();
+                var sw = $(window).width();
+
+                $menu
+                    .css({
+                        display: "none",
+                        left: sw+"px"
+                    })
+                    .css("display", "block")
+                    .animate(
+                        { left: "-="+w+"px" }, 1500
+                    );
+            });
+
+            $("#hd_menu_close").click(function() {
+                var $menu = $("#menu_wrap");
+                var w = $menu.width();
+                var sw = $(window).width();
+
+                $menu.animate(
+                        { left: "+="+w+"px" }, 1500,
+                        function() {
+                            $menu.css("display", "none");
+                        }
+                    );
+            });
+        });
+        </script>
+
         <button type="button" id="hd_sch_open">검색<span class="sound_only"> 열기</span></button>
 
         <aside id="hd_sch">
@@ -86,6 +164,7 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
 
         <ul id="hd_nb">
             <li><a href="<?php echo G5_BBS_URL ?>/qalist.php" id="snb_new">1:1문의</a></li>
+            <li><a href="<?php echo G5_BBS_URL ?>/faq.php" id="snb_faq">FAQ</a></li>
             <li><a href="<?php echo G5_BBS_URL ?>/current_connect.php" id="snb_cnt">접속자 <?php echo connect(); // 현재 접속자수 ?></a></li>
             <li><a href="<?php echo G5_BBS_URL ?>/new.php" id="snb_new">새글</a></li>
             <?php if ($is_member) { ?>
@@ -108,26 +187,6 @@ include_once(G5_LIB_PATH.'/popular.lib.php');
 
 <hr>
 
-<div id="lnb">
-    <ul>
-        <?php
-        $sql2 = " select * from {$g5['board_table']} where bo_show_menu = 1 and bo_device <> 'pc' ";
-        if ($gr_id) $sql2 .= " and gr_id = '$gr_id' ";
-        $sql2 .= " order by bo_order ";
-        $result2 = sql_query($sql2);
-        for ($bi=0; $row2=sql_fetch_array($result2); $bi++) { // bi 는 board index
-            $bo_subject = $row2['bo_subject'];
-            if (G5_IS_MOBILE && $row2['bo_mobile_subject']) {
-                $bo_subject = $row2['bo_mobile_subject'];
-            }
-        ?>
-        <li><a href="<?php echo G5_BBS_URL ?>/board.php?bo_table=<?php echo $row2['bo_table'] ?>"><?php echo $bo_subject; ?></a></li>
-        <?php } ?>
-    </ul>
-</div>
-
-<hr>
-
 <div id="wrapper">
     <div id="aside">
         <?php echo outlogin('basic'); // 외부 로그인 ?>

mobile/skin/faq/basic/list.skin.php

@@ -0,0 +1,118 @@
+<?php
+if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
+
+// add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
+add_stylesheet('<link rel="stylesheet" href="'.$faq_skin_url.'/style.css">', 0);
+?>
+
+<!-- FAQ 시작 { -->
+<?php
+// 상단 HTML
+echo '<div id="faq_hhtml">'.stripslashes($fm['fm_mobile_head_html']).'</div>';
+?>
+
+<form name="faq_search_form" method="get">
+<input type="hidden" name="fm_id" value="<?php echo $fm_id;?>">
+<label for="stx" class="sound_only">검색어<strong class="sound_only"> 필수</strong></label>
+<input type="text" name="stx" value="<?php echo $stx;?>" required id="stx" class="frm_input required" size="15" maxlength="15">
+<input type="submit" value="검색" class="btn_submit">
+</form>
+
+<?php
+if( count($faq_master_list) ){
+?>
+<nav id="bo_cate">
+    <h2>자주하시는질문 분류</h2>
+    <ul id="bo_cate_ul">
+        <?php
+        foreach( $faq_master_list as $v ){
+            $category_msg = '';
+            $category_option = '';
+            if($v['fm_id'] == $fm_id){ // 현재 선택된 카테고리라면
+                $category_option = ' id="bo_cate_on"';
+                $category_msg = '<span class="sound_only">열린 분류 </span>';
+            }
+        ?>
+        <li><a href="<?php echo $category_href;?>?fm_id=<?php echo $v['fm_id'].$category_stx;?>" <?php echo $category_option;?> ><?php echo $category_msg.$v['fm_subject'];?></a></li>
+        <?php
+        }
+        ?>
+    </ul>
+</nav>
+<?php } ?>
+
+<div id="faq_wrap" class="faq_<?php echo $fm_id; ?>">
+    <?php // FAQ 내용
+    if( count($faq_list) ){
+    ?>
+    <section id="faq_con">
+        <h2><?php echo $g5['title']; ?> 목록</h2>
+        <ol>
+            <?php
+            foreach($faq_list as $key=>$v){
+                if(empty($v))
+                    continue;
+            ?>
+            <li>
+                <h3><a href="#none" onclick="return faq_open(this);"><?php echo conv_content($v['fa_subject'], 1); ?></a></h3>
+                <div class="con_inner">
+                    <?php echo conv_content($v['fa_content'], 1); ?>
+                    <button type="button" class="btn_faq_close">닫기</button>
+                </div>
+            </li>
+            <?php
+            }
+            ?>
+        </ol>
+    </section>
+    <?php
+
+    } else {
+        if($stx){
+            echo '<p>검색된 게시물이 없습니다.</p>';
+        } else {
+            echo '<p>등록된 FAQ가 없습니다.';
+            if($is_admin)
+                echo '<br><a href="'.G5_ADMIN_URL.'/faqmasterlist.php">FAQ를 새로 등록하시려면 FAQ관리</a> 메뉴를 이용하십시오.';
+            echo '</p>';
+        }
+    }
+    ?>
+</div>
+
+<?php echo get_paging($page_rows, $page, $total_page, $_SERVER['PHP_SELF'].'?'.$qstr.'&amp;page='); ?>
+
+<?php
+// 하단 HTML
+echo '<div id="faq_thtml">'.stripslashes($fm['fm_tail_html']).'</div>';
+?>
+<!-- } FAQ 끝 -->
+
+<script src="<?php echo G5_JS_URL; ?>/viewimageresize.js"></script>
+<script>
+$(function() {
+    $(".btn_faq_close").on("click", function() {
+        $(this).closest(".con_inner").slideToggle();
+    });
+});
+
+function faq_open(el)
+{
+    var $con = $(el).closest("li").find(".con_inner");
+
+    if($con.is(":visible")) {
+        $con.slideUp();
+    } else {
+        $("#faq_con .con_inner:visible").css("display", "none");
+
+        $con.slideDown(
+            function() {
+                // 이미지 리사이즈
+                $con.viewimageresize2();
+            }
+        );
+    }
+
+    return false;
+}
+</script>

mobile/skin/faq/basic/style.css

@@ -0,0 +1,10 @@
+@charset "utf-8";
+
+#bo_cate h2 {position:absolute;font-size:0;line-height:0;overflow:hidden}
+#bo_cate ul {margin-bottom:10px;padding-left:1px;width:728px;zoom:1}
+#bo_cate ul:after {display:block;visibility:hidden;clear:both;content:""}
+#bo_cate li {float:left;margin-bottom:-1px}
+#bo_cate a {display:block;position:relative;margin-left:-1px;padding:6px 0 5px;width:90px;border:1px solid #ddd;background:#f7f7f7;color:#888;text-align:center;letter-spacing:-0.1em;line-height:1.2em;cursor:pointer}
+#bo_cate a:focus, #bo_cate a:hover, #bo_cate a:active {text-decoration:none}
+#bo_cate #bo_cate_on {z-index:2;border:1px solid #565e60;background:#fff;color:#565e60;font-weight:bold}
+

mobile/tail.php

@@ -6,23 +6,6 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
 
 <hr>
 
-<nav id="gnb">
-    <script>$('#gnb').addClass('gnb_js');</script>
-    <h2>메인메뉴</h2>
-    <ul>
-        <?php
-        $sql = " select * from {$g5['group_table']} where gr_show_menu = 1 and gr_device <> 'pc' order by gr_order ";
-        $result = sql_query($sql);
-        for ($gi=0; $row=sql_fetch_array($result); $gi++) { // gi 는 group index
-        ?>
-        <li><a href="<?php echo G5_BBS_URL ?>/group.php?gr_id=<?php echo $row['gr_id'] ?>"><?php echo $row['gr_subject'] ?></a></li>
-        <?php } ?>
-        <?php if ($gi == 0) { ?><li class="gnb_empty">생성된 메뉴가 없습니다.</a><?php } ?>
-    </ul>
-</nav>
-
-<hr>
-
 <?php echo poll('basic'); // 설문조사 ?>
 
 <hr>