Merge branch 'master' of github.com:gnuboard/g5

2020-05-06 11:59:02 +09:00
parent 812dbc78e0 468bc6eb1c
commit 045e1363a4
66 changed files with 750 additions and 377 deletions
--- a/theme/basic/mobile/skin/board/basic/style.css
+++ b/theme/basic/mobile/skin/board/basic/style.css
@ -85,6 +85,7 @@
 .more_opt {display:none;position:absolute;top:50px;right:7px;background:#fff;border:1px solid #b8bfc4;z-index:999}
 .more_opt:before {content:"";position:absolute;top:-8px;right:6px;width:0;height:0;border-style:solid;border-width:0 6px 8px 6px;border-color:transparent transparent #b8bfc4 transparent}
 .more_opt:after {content:"";position:absolute;top:-6px;right:6px;width:0;height:0;border-style:solid;border-width:0 6px 8px 6px;border-color:transparent transparent #fff transparent}
+.more_opt.is_list_btn{width:90px}
 .more_opt li {display:block;border-bottom:1px solid #f1f1f1;padding:10px;margin:0;color:#6b757c;text-align:left}
 .more_opt li:last-child {border-bottom:0}
 .more_opt li button, .more_opt li a {width:100%;border:0;background:#fff;color:#6b757c}
--- a/theme/basic/mobile/skin/board/basic/view.skin.php
+++ b/theme/basic/mobile/skin/board/basic/view.skin.php
@ -143,7 +143,7 @@ jQuery(function($){
            if (isset($view['file'][$i]['source']) && $view['file'][$i]['source'] && !$view['file'][$i]['view']) {
         ?>
            <li>
-                <a href="<?php echo $view['file'][$i]['href'];  ?>" class="view_file_download">
+                <a href="<?php echo $view['file'][$i]['href'];  ?>" class="view_file_download" download>
                    <i class="fa fa-download" aria-hidden="true"></i>
                    <strong><?php echo $view['file'][$i]['source'] ?></strong>
                    <?php echo $view['file'][$i]['content'] ?> (<?php echo $view['file'][$i]['size'] ?>)
--- a/theme/basic/mobile/skin/board/basic/view_comment.skin.php
+++ b/theme/basic/mobile/skin/board/basic/view_comment.skin.php
@ -22,6 +22,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
 		$str = preg_replace("/\[\<a\s.*href\=\"(http|https|ftp|mms)\:\/\/([^[:space:]]+)\.(mp3|wma|wmv|asf|asx|mpg|mpeg)\".*\<\/a\>\]/i", "<script>doc_write(obj_movie('$1://$2.$3'));</script>", $str);
 		$c_reply_href = $comment_common_url.'&amp;c_id='.$comment_id.'&amp;w=c#bo_vc_w';
 		$c_edit_href = $comment_common_url.'&amp;c_id='.$comment_id.'&amp;w=cu#bo_vc_w';
+        $is_comment_reply_edit = ($list[$i]['is_reply'] || $list[$i]['is_edit'] || $list[$i]['is_del']) ? 1 : 0;
    ?>
    <article id="c_<?php echo $comment_id ?>" <?php if ($cmt_depth) { ?>style="margin-left:<?php echo $cmt_depth ?>px;border-bottom-color:#f8f8f8"<?php } ?>>
        <div class="comment_inner">
@ -37,6 +38,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
                <?php
                include(G5_SNS_PATH."/view_comment_list.sns.skin.php");
                ?>
+                <?php if( $is_comment_reply_edit ){ ?>
                <div class="bo_vl_opt">
                    <button type="button" class="btn_cm_opt btn_b03 btn"><i class="fa fa-ellipsis-v" aria-hidden="true"></i><span class="sound_only">댓글 옵션</span></button>
                    <ul class="bo_vc_act">
@ -45,6 +47,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
                        <?php if ($list[$i]['is_del']) { ?><li><a href="<?php echo $list[$i]['del_link']; ?>" onclick="return comment_delete();">삭제</a></li><?php } ?>
                    </ul>
                </div>
+                <?php } ?>
                <script>
                $(function() {			    
                    // 댓글 옵션창 열기
--- a/theme/basic/mobile/skin/board/gallery/style.css
+++ b/theme/basic/mobile/skin/board/gallery/style.css
@ -74,6 +74,7 @@
 .more_opt {display:none;position:absolute;top:50px;right:7px;background:#fff;border:1px solid #b8bfc4;z-index:999}
 .more_opt:before {content:"";position:absolute;top:-8px;right:6px;width:0;height:0;border-style:solid;border-width:0 6px 8px 6px;border-color:transparent transparent #b8bfc4 transparent}
 .more_opt:after {content:"";position:absolute;top:-6px;right:6px;width:0;height:0;border-style:solid;border-width:0 6px 8px 6px;border-color:transparent transparent #fff transparent}
+.more_opt.is_list_btn{width:90px}
 .more_opt li {display:block;border-bottom:1px solid #f1f1f1;padding:10px;margin:0;color:#6b757c;text-align:left}
 .more_opt li:last-child {border-bottom:0}
 .more_opt li button, .more_opt li a {width:100%;border:0;background:#fff;color:#6b757c}
--- a/theme/basic/mobile/skin/board/gallery/view.skin.php
+++ b/theme/basic/mobile/skin/board/gallery/view.skin.php
@ -145,7 +145,7 @@ jQuery(function($){
            if (isset($view['file'][$i]['source']) && $view['file'][$i]['source'] && !$view['file'][$i]['view']) {
         ?>
            <li>
-                <a href="<?php echo $view['file'][$i]['href'];  ?>" class="view_file_download">
+                <a href="<?php echo $view['file'][$i]['href'];  ?>" class="view_file_download" download>
                    <i class="fa fa-download" aria-hidden="true"></i>
                    <strong><?php echo $view['file'][$i]['source'] ?></strong>
                    <?php echo $view['file'][$i]['content'] ?> (<?php echo $view['file'][$i]['size'] ?>)
--- a/theme/basic/mobile/skin/board/gallery/view_comment.skin.php
+++ b/theme/basic/mobile/skin/board/gallery/view_comment.skin.php
@ -22,6 +22,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
 		$str = preg_replace("/\[\<a\s.*href\=\"(http|https|ftp|mms)\:\/\/([^[:space:]]+)\.(mp3|wma|wmv|asf|asx|mpg|mpeg)\".*\<\/a\>\]/i", "<script>doc_write(obj_movie('$1://$2.$3'));</script>", $str);
 		$c_reply_href = $comment_common_url.'&amp;c_id='.$comment_id.'&amp;w=c#bo_vc_w';
 		$c_edit_href = $comment_common_url.'&amp;c_id='.$comment_id.'&amp;w=cu#bo_vc_w';
+        $is_comment_reply_edit = ($list[$i]['is_reply'] || $list[$i]['is_edit'] || $list[$i]['is_del']) ? 1 : 0;
    ?>
    <article id="c_<?php echo $comment_id ?>" <?php if ($cmt_depth) { ?>style="margin-left:<?php echo $cmt_depth ?>px;border-bottom-color:#f8f8f8"<?php } ?>>
        <div class="comment_inner">
@ -37,6 +38,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
                <?php
                include(G5_SNS_PATH."/view_comment_list.sns.skin.php");
                ?>
+                <?php if( $is_comment_reply_edit ){ ?>
                <div class="bo_vl_opt">
                    <button type="button" class="btn_cm_opt btn_b03 btn"><i class="fa fa-ellipsis-v" aria-hidden="true"></i><span class="sound_only">댓글 옵션</span></button>
                    <ul class="bo_vc_act">
@ -45,6 +47,7 @@ var char_max = parseInt(<?php echo $comment_max ?>); // 최대
                        <?php if ($list[$i]['is_del']) { ?><li><a href="<?php echo $list[$i]['del_link']; ?>" onclick="return comment_delete();">삭제</a></li><?php } ?>
                    </ul>
                </div>
+                <?php } ?>
                <script>
                $(function() {			    
                    // 댓글 옵션창 열기
--- a/theme/basic/mobile/skin/qa/basic/view.skin.php
+++ b/theme/basic/mobile/skin/qa/basic/view.skin.php
@ -99,7 +99,7 @@ $(".btn_more_opt").on("click", function() {
            for ($i=0; $i<$view['download_count']; $i++) {
             ?>
                <li>
-                    <a href="<?php echo $view['download_href'][$i];  ?>" class="view_file_download">
+                    <a href="<?php echo $view['download_href'][$i];  ?>" class="view_file_download" download>
                        <img src="<?php echo $qa_skin_url ?>/img/icon_file.gif" alt="첨부">
                        <strong><?php echo $view['download_source'][$i] ?></strong>
                    </a>