From a402501c6fe649cd47ed90a6ff8ec9d6deb50c31 Mon Sep 17 00:00:00 2001
From: thisgun <thisgun@naver.com>
Date: Fri, 10 Nov 2017 10:59:20 +0900
Subject: [PATCH] =?UTF-8?q?=EA=B0=A4=EB=9F=AC=EB=A6=AC=20=EC=8A=A4?=
 =?UTF-8?q?=ED=82=A8=20=EC=88=98=EC=A0=95=20=EB=B0=8F=20=EC=9D=BC=EB=B6=80?=
 =?UTF-8?q?=20=EC=BD=94=EB=93=9C=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/board_form.php                           |   6 +-
 adm/config_form.php                          |   9 +-
 adm/css/admin.css                            |   3 +-
 adm/member_form.php                          |   2 +-
 install/install_db.php                       |   2 +-
 plugin/social/includes/functions.php         |   8 ++
 plugin/social/index.php                      |   5 +
 skin/board/gallery/list.skin.php             | 142 ++++++++++---------
 skin/board/gallery/style.css                 |  21 ++-
 theme/basic/skin/board/gallery/list.skin.php | 142 ++++++++++---------
 theme/basic/skin/board/gallery/style.css     |  21 ++-
 11 files changed, 210 insertions(+), 151 deletions(-)

diff --git a/adm/board_form.php b/adm/board_form.php
index 5f314041f..29d574ac5 100644
--- a/adm/board_form.php
+++ b/adm/board_form.php
@@ -98,8 +98,8 @@ if ($w == '') {
     $board['bo_download_point'] = $config['cf_download_point'];
 
     $board['bo_gallery_cols'] = 4;
-    $board['bo_gallery_width'] = 174;
-    $board['bo_gallery_height'] = 124;
+    $board['bo_gallery_width'] = 202;
+    $board['bo_gallery_height'] = 150;
     $board['bo_mobile_gallery_width'] = 125;
     $board['bo_mobile_gallery_height'] = 100;
     $board['bo_table_width'] = 100;
@@ -963,7 +963,7 @@ $pg_anchor = '<ul class="anchor">
             <th scope="row"><label for="bo_gallery_cols">갤러리 이미지 수<strong class="sound_only">필수</strong></label></th>
             <td>
                 <?php echo help('갤러리 형식의 게시판 목록에서 이미지를 한줄에 몇장씩 보여 줄 것인지를 설정하는 값') ?>
-                <input type="text" name="bo_gallery_cols" value="<?php echo $board['bo_gallery_cols'] ?>" id="bo_gallery_cols" required class="required numeric frm_input" size="4">
+                <?php echo get_member_level_select('bo_gallery_cols', 1, 10, $board['bo_gallery_cols']); ?>
             </td>
             <td class="td_grpset">
                 <input type="checkbox" name="chk_grp_gallery_cols" value="1" id="chk_grp_gallery_cols">
diff --git a/adm/config_form.php b/adm/config_form.php
index ed5bf581c..68724f9cc 100644
--- a/adm/config_form.php
+++ b/adm/config_form.php
@@ -1026,7 +1026,7 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
                     <label for="check_social_naver">네이버 로그인을 사용합니다</label>
                     <div>
                     <h3>네이버 CallbackURL</h3>
-                    <p><?php echo G5_SOCIAL_BASE_URL; ?>/?hauth.done=Naver</p>
+                    <p><?php echo get_social_callbackurl('naver'); ?></p>
                     </div>
                 </p>
                 <p>
@@ -1035,8 +1035,7 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
                     <div>
                     <h3>카카오 웹 Redirect Path</h3>
                     <p>
-                    <?php /* echo '/'.ltrim(parse_url(G5_SOCIAL_BASE_URL, PHP_URL_PATH), '/').'/?hauth.done=Kakao'; */ ?>
-                    <?php echo G5_SOCIAL_BASE_URL.'/?hauth.done=Kakao';?>
+                    <p><?php echo get_social_callbackurl('kakao'); ?></p>
                     </p>
                     </div>
                 </p>
@@ -1045,7 +1044,7 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
                     <label for="check_social_facebook">페이스북 로그인을 사용합니다</label>
                     <div>
                     <h3>페이스북 CallbackURL</h3>
-                    <p><?php echo G5_SOCIAL_BASE_URL; ?>/?hauth.done=Facebook</p>
+                    <p><?php echo get_social_callbackurl('facebook'); ?></p>
                     </div>
                 </p>
                 <p>
@@ -1053,7 +1052,7 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {
                     <label for="check_social_google">구글 로그인을 사용합니다</label>
                     <div>
                     <h3>구글 CallbackURL</h3>
-                    <p><?php echo G5_SOCIAL_BASE_URL; ?>/?hauth.done=Google</p>
+                    <p><?php echo get_social_callbackurl('google'); ?></p>
                     </div>
                 </p>
                 <p>
diff --git a/adm/css/admin.css b/adm/css/admin.css
index 203b35588..5dc1a56ae 100644
--- a/adm/css/admin.css
+++ b/adm/css/admin.css
@@ -650,7 +650,8 @@ box-shadow: 2px 2px 3px 0px rgba(0,0,0,0.2);}
 .account_provider{position:relative;margin:10px 0 5px}
 .account_provider .sns-wrap-32 .sns-icon{vertical-align:middle}
 .account_provider .provider_name{display:inline-block;vertical-align:middle}
-.account_provider .social_unlink{position:absolute;top:-7px;right:0; height:30px;line-height:30px;background:#a0a8b8;padding:0 10px;color:#fff;display:inline-block;vertical-align:middle}
+.account_provider .btn_info{position:absolute;top:-7px;right:0}
+.account_provider .social_unlink{height:30px;line-height:30px;background:#a0a8b8;padding:0 10px;color:#fff;display:inline-block;vertical-align:middle}
 .account_provider .social_unlink:hover{text-decoration:none}
 
 /*부가서비스*/
diff --git a/adm/member_form.php b/adm/member_form.php
index e404c5312..ca70694fc 100644
--- a/adm/member_form.php
+++ b/adm/member_form.php
@@ -366,7 +366,7 @@ this.form.mb_intercept_date.value=this.form.mb_intercept_date.defaultValue; }">
                         <span class="provider_name"><?php echo $provider_name;   //서비스이름?> ( <?php echo $account['displayname']; ?> )</span>
                         <span class="account_hidden" style="display:none"><?php echo $account['mb_id']; ?></span>
                     </div>
-                    <div><a href="<?php echo G5_SOCIAL_LOGIN_URL.'/unlink.php?mp_no='.$account['mp_no'] ?>" class="social_unlink" data-provider="<?php echo $account['mp_no'];?>" >연결해제</a></div>
+                    <div class="btn_info"><a href="<?php echo G5_SOCIAL_LOGIN_URL.'/unlink.php?mp_no='.$account['mp_no'] ?>" class="social_unlink" data-provider="<?php echo $account['mp_no'];?>" >연동해제</a> <span class="sound_only"><?php echo substr($account['mp_register_day'], 2, 14); ?></span></div>
                 </div>
                 <?php } //end foreach ?>
             </li>
diff --git a/install/install_db.php b/install/install_db.php
index 052d4de6a..e2b704186 100644
--- a/install/install_db.php
+++ b/install/install_db.php
@@ -271,7 +271,7 @@ for ($i=0; $i<count($tmp_bo_table); $i++)
                     bo_mobile_content_tail     = '',
                     bo_insert_content   = '',
                     bo_gallery_cols     = '4',
-                    bo_gallery_width    = '200',
+                    bo_gallery_width    = '202',
                     bo_gallery_height   = '150',
                     bo_mobile_gallery_width = '125',
                     bo_mobile_gallery_height= '100',
diff --git a/plugin/social/includes/functions.php b/plugin/social/includes/functions.php
index b73a02dbe..056c401d1 100644
--- a/plugin/social/includes/functions.php
+++ b/plugin/social/includes/functions.php
@@ -44,6 +44,14 @@ function get_social_convert_id($identifier, $service)
     return strtolower($service).'_'.hash('adler32', md5($identifier));
 }
 
+function get_social_callbackurl($provider){
+
+    $base_url = SOCIAL_LOGIN_BASE_URL;
+    $base_url = $base_url . ( strpos($base_url, '?') ? '&' : '?' ).G5_SOCIAL_LOGIN_DONE_PARAM.'='.$provider;
+
+    return $base_url;
+}
+
 function social_return_from_provider_page( $provider, $login_action_url, $mb_id, $mb_password, $url, $use_popup=2 ){
 
     $ref = $_SERVER['HTTP_REFERER'];
diff --git a/plugin/social/index.php b/plugin/social/index.php
index 4be5c9531..eb3b1288c 100644
--- a/plugin/social/index.php
+++ b/plugin/social/index.php
@@ -10,6 +10,11 @@
 // ------------------------------------------------------------------------
 
 include_once('_common.php');
+
+if( ! $config['cf_social_login_use']){
+    die("소셜로그인을 사용하지 않습니다.");
+}
+
 require_once( "includes/g5_endpoint.php" );
 
 error_reporting(0); // Turn off all error reporting
diff --git a/skin/board/gallery/list.skin.php b/skin/board/gallery/list.skin.php
index f025b13d5..6a789c9b6 100644
--- a/skin/board/gallery/list.skin.php
+++ b/skin/board/gallery/list.skin.php
@@ -54,81 +54,89 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     </div>
     <?php } ?>
 
-    <ul id="gall_ul">
+    <ul id="gall_ul" class="gall_row">
         <?php for ($i=0; $i<count($list); $i++) {
-            if($i>0 && ($i % $bo_gallery_cols == 0))
-                $style = 'clear:both;';
-            else
-                $style = '';
-            if ($i == 0) $k = 0;
-            $k += 1;
-            if ($k % $bo_gallery_cols == 0) $style .= "margin:0 !important;";
+
+            $classes = array();
+            
+            $classes[] = 'gall_li';
+            $classes[] = 'col-gn-'.$bo_gallery_cols;
+
+            if( $i && ($i % $bo_gallery_cols == 0) ){
+                $classes[] = 'box_clear';
+            }
+
+            if( $wr_id && $wr_id == $list[$i]['wr_id'] ){
+                $classes[] = 'gall_now';
+            }
          ?>
-        <li class="gall_li <?php if ($wr_id == $list[$i]['wr_id']) { ?>gall_now<?php } ?>" style="<?php echo $style ?>width:<?php echo $board['bo_gallery_width']+2 ?>px">
-            <div class="gall_chk">
-            <?php if ($is_checkbox) { ?>
-            <label for="chk_wr_id_<?php echo $i ?>" class="sound_only"><?php echo $list[$i]['subject'] ?></label>
-            <input type="checkbox" name="chk_wr_id[]" value="<?php echo $list[$i]['wr_id'] ?>" id="chk_wr_id_<?php echo $i ?>">
-            <?php } ?>
-            <span class="sound_only">
-                <?php
-                if ($wr_id == $list[$i]['wr_id'])
-                    echo "<span class=\"bo_current\">열람중</span>";
-                else
-                    echo $list[$i]['num'];
-                 ?>
-            </span>
-            </div>
-            <div class="gall_con">
-                <div class="gall_img">
-                    <a href="<?php echo $list[$i]['href'] ?>">
+        <li class="<?php echo implode(' ', $classes); ?>">
+            <div class="gall_box">
+                <div class="gall_chk">
+                <?php if ($is_checkbox) { ?>
+                <label for="chk_wr_id_<?php echo $i ?>" class="sound_only"><?php echo $list[$i]['subject'] ?></label>
+                <input type="checkbox" name="chk_wr_id[]" value="<?php echo $list[$i]['wr_id'] ?>" id="chk_wr_id_<?php echo $i ?>">
+                <?php } ?>
+                <span class="sound_only">
                     <?php
-                    if ($list[$i]['is_notice']) { // 공지사항  ?>
-                        <strong style="width:<?php echo $board['bo_gallery_width'] ?>px;height:<?php echo $board['bo_gallery_height'] ?>px">공지</strong>
-                    <?php } else {
-                        $thumb = get_list_thumbnail($board['bo_table'], $list[$i]['wr_id'], $board['bo_gallery_width'], $board['bo_gallery_height']);
-
-                        if($thumb['src']) {
-                            $img_content = '<img src="'.$thumb['src'].'" alt="'.$thumb['alt'].'" width="'.$board['bo_gallery_width'].'" height="'.$board['bo_gallery_height'].'">';
-                        } else {
-                            $img_content = '<span style="width:'.$board['bo_gallery_width'].'px;height:'.$board['bo_gallery_height'].'px">no image</span>';
-                        }
-
-                        echo $img_content;
-                    }
+                    if ($wr_id == $list[$i]['wr_id'])
+                        echo "<span class=\"bo_current\">열람중</span>";
+                    else
+                        echo $list[$i]['num'];
                      ?>
-                    </a>
+                </span>
                 </div>
-                <div class="gall_text_href">
-                    <?php
-                    // echo $list[$i]['icon_reply']; 갤러리는 reply 를 사용 안 할 것 같습니다. - 지운아빠 2013-03-04
-                    if ($is_category && $list[$i]['ca_name']) {
-                     ?>
-                    <a href="<?php echo $list[$i]['ca_name_href'] ?>" class="bo_cate_link"><?php echo $list[$i]['ca_name'] ?></a>
-                    <?php } ?>
-                    <a href="<?php echo $list[$i]['href'] ?>" class="bo_tit">
-                        <?php echo $list[$i]['subject'] ?>
-                        <?php if ($list[$i]['comment_cnt']) { ?><span class="sound_only">댓글</span><?php echo rtrim($list[$i]['comment_cnt']); ?><span class="sound_only">개</span><?php } ?>
+                <div class="gall_con">
+                    <div class="gall_img">
+                        <a href="<?php echo $list[$i]['href'] ?>">
                         <?php
-                        // if ($list[$i]['link']['count']) { echo '['.$list[$i]['link']['count']}.']'; }
-                        // if ($list[$i]['file']['count']) { echo '<'.$list[$i]['file']['count'].'>'; }
+                        if ($list[$i]['is_notice']) { // 공지사항  ?>
+                            <span class="is_notice">공지</span>
+                        <?php } else {
+                            $thumb = get_list_thumbnail($board['bo_table'], $list[$i]['wr_id'], $board['bo_gallery_width'], $board['bo_gallery_height'], false, true);
 
-                        if (isset($list[$i]['icon_new'])) echo rtrim($list[$i]['icon_new']);
-                        if (isset($list[$i]['icon_hot'])) echo rtrim($list[$i]['icon_hot']);
-                        //if (isset($list[$i]['icon_file'])) echo rtrim($list[$i]['icon_file']);
-                        //if (isset($list[$i]['icon_link'])) echo rtrim($list[$i]['icon_link']);
-                        if (isset($list[$i]['icon_secret'])) echo rtrim($list[$i]['icon_secret']);
+                            if($thumb['src']) {
+                                $img_content = '<img src="'.$thumb['src'].'" alt="'.$thumb['alt'].'" >';
+                            } else {
+                                $img_content = '<span class="no_image">no image</span>';
+                            }
+
+                            echo $img_content;
+                        }
                          ?>
-                     </a>
-                </div>
-                <div class="gall_name">
-                    <span class="sound_only">작성자 </span><span class="profile_img"><img src="<?php echo G5_IMG_URL ;?>/no_profile.gif" alt="프로필이미지" width="20" height="20"></span><?php echo $list[$i]['name'] ?>
-                </div>
-                <div class="gall_info">
-                    <span class="sound_only">조회 </span><i class="fa fa-eye" aria-hidden="true"></i> <?php echo $list[$i]['wr_hit'] ?>
-                    <?php if ($is_good) { ?><span class="sound_only">추천</span><strong><i class="fa fa-thumbs-o-up" aria-hidden="true"></i> <?php echo $list[$i]['wr_good'] ?></strong><?php } ?>
-                    <?php if ($is_nogood) { ?><span class="sound_only">비추천</span><strong><i class="fa fa-thumbs-o-down" aria-hidden="true"></i> <?php echo $list[$i]['wr_nogood'] ?></strong><?php } ?>
-                    <span class="gall_date"><span class="sound_only">작성일 </span><i class="fa fa-clock-o" aria-hidden="true"></i> <?php echo $list[$i]['datetime2'] ?></span>
+                        </a>
+                    </div>
+                    <div class="gall_text_href">
+                        <?php
+                        // echo $list[$i]['icon_reply']; 갤러리는 reply 를 사용 안 할 것 같습니다. - 지운아빠 2013-03-04
+                        if ($is_category && $list[$i]['ca_name']) {
+                         ?>
+                        <a href="<?php echo $list[$i]['ca_name_href'] ?>" class="bo_cate_link"><?php echo $list[$i]['ca_name'] ?></a>
+                        <?php } ?>
+                        <a href="<?php echo $list[$i]['href'] ?>" class="bo_tit">
+                            <?php echo $list[$i]['subject'] ?>
+                            <?php if ($list[$i]['comment_cnt']) { ?><span class="sound_only">댓글</span><?php echo rtrim($list[$i]['comment_cnt']); ?><span class="sound_only">개</span><?php } ?>
+                            <?php
+                            // if ($list[$i]['link']['count']) { echo '['.$list[$i]['link']['count']}.']'; }
+                            // if ($list[$i]['file']['count']) { echo '<'.$list[$i]['file']['count'].'>'; }
+
+                            if (isset($list[$i]['icon_new'])) echo rtrim($list[$i]['icon_new']);
+                            if (isset($list[$i]['icon_hot'])) echo rtrim($list[$i]['icon_hot']);
+                            //if (isset($list[$i]['icon_file'])) echo rtrim($list[$i]['icon_file']);
+                            //if (isset($list[$i]['icon_link'])) echo rtrim($list[$i]['icon_link']);
+                            if (isset($list[$i]['icon_secret'])) echo rtrim($list[$i]['icon_secret']);
+                             ?>
+                         </a>
+                    </div>
+                    <div class="gall_name">
+                        <span class="sound_only">작성자 </span><span class="profile_img"><img src="<?php echo G5_IMG_URL ;?>/no_profile.gif" alt="프로필이미지" width="20" height="20"></span><?php echo $list[$i]['name'] ?>
+                    </div>
+                    <div class="gall_info">
+                        <span class="sound_only">조회 </span><i class="fa fa-eye" aria-hidden="true"></i> <?php echo $list[$i]['wr_hit'] ?>
+                        <?php if ($is_good) { ?><span class="sound_only">추천</span><strong><i class="fa fa-thumbs-o-up" aria-hidden="true"></i> <?php echo $list[$i]['wr_good'] ?></strong><?php } ?>
+                        <?php if ($is_nogood) { ?><span class="sound_only">비추천</span><strong><i class="fa fa-thumbs-o-down" aria-hidden="true"></i> <?php echo $list[$i]['wr_nogood'] ?></strong><?php } ?>
+                        <span class="gall_date"><span class="sound_only">작성일 </span><i class="fa fa-clock-o" aria-hidden="true"></i> <?php echo $list[$i]['datetime2'] ?></span>
+                    </div>
                 </div>
             </div>
         </li>
diff --git a/skin/board/gallery/style.css b/skin/board/gallery/style.css
index 3472a6821..b6de977f0 100644
--- a/skin/board/gallery/style.css
+++ b/skin/board/gallery/style.css
@@ -94,16 +94,31 @@ box-shadow:inset 0 2px 5px rgb(33, 135, 202);}
 
 /* 갤러리 목록 */
 #bo_gall h2 {margin:0;padding:0;width:1px;height:1px;font-size:0;line-height:0;overflow:hidden}
-#bo_gall #gall_ul {margin:10px 0 0;padding:0;list-style:none;zoom:1}
+#bo_gall #gall_ul {margin:10px -10px 0;padding:0;list-style:none;zoom:1}
 #bo_gall #gall_ul:after {display:block;visibility:hidden;clear:both;content:""}
-#bo_gall .gall_li {float:left;position:relative;margin:0 20px 30px 0 ;border:1px solid #ccc;background:#fff;border-radius:0 0 2px 2px}
+#bo_gall .gall_box {position:relative;margin:0 0 30px 0;border:1px solid #ccc;background:#fff;border-radius:0 0 2px 2px}
 #bo_gall .gall_li .gall_chk{position:absolute;top:0;left:0;padding:5px;}
 
+.gall_row .col-gn-0,.gall_row .col-gn-1,.gall_row .col-gn-2,.gall_row .col-gn-3,.gall_row .col-gn-4,.gall_row .col-gn-5,.gall_row .col-gn-6,.gall_row .col-gn-7,.gall_row .col-gn-8,.gall_row .col-gn-9,.gall_row .col-gn-10{position:relative;min-height:1px;padding-left:10px;*padding-left:0;padding-right:10px;*padding-right:0;float:left;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin-left:0;}
+.gall_row .col-gn-0,.latest_row .col-gn-1{width:100%}
+.gall_row .col-gn-2{width:50%}
+.gall_row .col-gn-3{width:33.33333333%}
+.gall_row .col-gn-4{width:25%}
+.gall_row .col-gn-5{width:20%}
+.gall_row .col-gn-6{width:16.66666667%}
+.gall_row .col-gn-7{width:14.28571428%}
+.gall_row .col-gn-8{width:12.5%}
+.gall_row .col-gn-9{width:11.11111111%}
+.gall_row .col-gn-10{width:10%}
+
+.gall_row .box_clear{clear:both}
 
 #bo_gall .gall_now .gall_text_href a {color:#ff3061}
 
 #bo_gall .gall_href a:link, #bo_gall .gall_href a:focus, #bo_gall .gall_href a:hover {text-decoration:none}
-#bo_gall .gall_img{border-bottom:1px solid #eee}
+#bo_gall .gall_img{border-bottom:1px solid #eee;text-align:center}
+#bo_gall .gall_img a,#bo_gall .gall_img .no_image,#bo_gall .gall_img .is_notice{display:block}
+#bo_gall .gall_img img{max-width:100%;height:auto !important}
 #bo_gall .gall_img span{display:inline-block;background:#eee;text-align:center;line-height:150px;text-transform:uppercase;font-weight:bold;font-size:1.25em;color:#777}
 
 #bo_gall .gall_text_href {margin:10px}
diff --git a/theme/basic/skin/board/gallery/list.skin.php b/theme/basic/skin/board/gallery/list.skin.php
index 3983cbf92..e3e22a327 100644
--- a/theme/basic/skin/board/gallery/list.skin.php
+++ b/theme/basic/skin/board/gallery/list.skin.php
@@ -54,81 +54,89 @@ add_stylesheet('<link rel="stylesheet" href="'.$board_skin_url.'/style.css">', 0
     </div>
     <?php } ?>
 
-    <ul id="gall_ul">
+    <ul id="gall_ul" class="gall_row">
         <?php for ($i=0; $i<count($list); $i++) {
-            if($i>0 && ($i % $bo_gallery_cols == 0))
-                $style = 'clear:both;';
-            else
-                $style = '';
-            if ($i == 0) $k = 0;
-            $k += 1;
-            if ($k % $bo_gallery_cols == 0) $style .= "margin:0 !important;";
+
+            $classes = array();
+            
+            $classes[] = 'gall_li';
+            $classes[] = 'col-gn-'.$bo_gallery_cols;
+
+            if( $i && ($i % $bo_gallery_cols == 0) ){
+                $classes[] = 'box_clear';
+            }
+
+            if( $wr_id && $wr_id == $list[$i]['wr_id'] ){
+                $classes[] = 'gall_now';
+            }
          ?>
-        <li class="gall_li <?php if ($wr_id == $list[$i]['wr_id']) { ?>gall_now<?php } ?>" style="<?php echo $style ?>width:<?php echo $board['bo_gallery_width']+2 ?>px">
-            <div class="gall_chk">
-            <?php if ($is_checkbox) { ?>
-            <label for="chk_wr_id_<?php echo $i ?>" class="sound_only"><?php echo $list[$i]['subject'] ?></label>
-            <input type="checkbox" name="chk_wr_id[]" value="<?php echo $list[$i]['wr_id'] ?>" id="chk_wr_id_<?php echo $i ?>">
-            <?php } ?>
-            <span class="sound_only">
-                <?php
-                if ($wr_id == $list[$i]['wr_id'])
-                    echo "<span class=\"bo_current\">열람중</span>";
-                else
-                    echo $list[$i]['num'];
-                 ?>
-            </span>
-            </div>
-            <div class="gall_con">
-                <div class="gall_img">
-                    <a href="<?php echo $list[$i]['href'] ?>">
+        <li class="<?php echo implode(' ', $classes); ?>">
+            <div class="gall_box">
+                <div class="gall_chk">
+                <?php if ($is_checkbox) { ?>
+                <label for="chk_wr_id_<?php echo $i ?>" class="sound_only"><?php echo $list[$i]['subject'] ?></label>
+                <input type="checkbox" name="chk_wr_id[]" value="<?php echo $list[$i]['wr_id'] ?>" id="chk_wr_id_<?php echo $i ?>">
+                <?php } ?>
+                <span class="sound_only">
                     <?php
-                    if ($list[$i]['is_notice']) { // 공지사항  ?>
-                        <strong style="width:<?php echo $board['bo_gallery_width'] ?>px;height:<?php echo $board['bo_gallery_height'] ?>px">공지</strong>
-                    <?php } else {
-                        $thumb = get_list_thumbnail($board['bo_table'], $list[$i]['wr_id'], $board['bo_gallery_width'], $board['bo_gallery_height']);
-
-                        if($thumb['src']) {
-                            $img_content = '<img src="'.$thumb['src'].'" alt="'.$thumb['alt'].'" width="'.$board['bo_gallery_width'].'" height="'.$board['bo_gallery_height'].'">';
-                        } else {
-                            $img_content = '<span style="width:'.$board['bo_gallery_width'].'px;height:'.$board['bo_gallery_height'].'px">no image</span>';
-                        }
-
-                        echo $img_content;
-                    }
+                    if ($wr_id == $list[$i]['wr_id'])
+                        echo "<span class=\"bo_current\">열람중</span>";
+                    else
+                        echo $list[$i]['num'];
                      ?>
-                    </a>
+                </span>
                 </div>
-                <div class="gall_text_href">
-                    <?php
-                    // echo $list[$i]['icon_reply']; 갤러리는 reply 를 사용 안 할 것 같습니다. - 지운아빠 2013-03-04
-                    if ($is_category && $list[$i]['ca_name']) {
-                     ?>
-                    <a href="<?php echo $list[$i]['ca_name_href'] ?>" class="bo_cate_link"><?php echo $list[$i]['ca_name'] ?></a>
-                    <?php } ?>
-                    <a href="<?php echo $list[$i]['href'] ?>" class="bo_tit">
-                        <?php echo $list[$i]['subject'] ?>
-                        <?php if ($list[$i]['comment_cnt']) { ?><span class="sound_only">댓글</span><?php echo rtrim($list[$i]['comment_cnt']); ?><span class="sound_only">개</span><?php } ?>
+                <div class="gall_con">
+                    <div class="gall_img">
+                        <a href="<?php echo $list[$i]['href'] ?>">
                         <?php
-                        // if ($list[$i]['link']['count']) { echo '['.$list[$i]['link']['count']}.']'; }
-                        // if ($list[$i]['file']['count']) { echo '<'.$list[$i]['file']['count'].'>'; }
+                        if ($list[$i]['is_notice']) { // 공지사항  ?>
+                            <span class="is_notice">공지</span>
+                        <?php } else {
+                            $thumb = get_list_thumbnail($board['bo_table'], $list[$i]['wr_id'], $board['bo_gallery_width'], $board['bo_gallery_height'], false, true);
 
-                        if (isset($list[$i]['icon_new'])) echo rtrim($list[$i]['icon_new']);
-                        if (isset($list[$i]['icon_hot'])) echo rtrim($list[$i]['icon_hot']);
-                        //if (isset($list[$i]['icon_file'])) echo rtrim($list[$i]['icon_file']);
-                        //if (isset($list[$i]['icon_link'])) echo rtrim($list[$i]['icon_link']);
-                        if (isset($list[$i]['icon_secret'])) echo rtrim($list[$i]['icon_secret']);
+                            if($thumb['src']) {
+                                $img_content = '<img src="'.$thumb['src'].'" alt="'.$thumb['alt'].'" >';
+                            } else {
+                                $img_content = '<span class="no_image">no image</span>';
+                            }
+
+                            echo $img_content;
+                        }
                          ?>
-                     </a>
-                </div>
-                <div class="gall_name">
-                    <span class="sound_only">작성자 </span><span class="profile_img"><img src="<?php echo G5_THEME_IMG_URL ;?>/no_profile.gif" alt="프로필이미지" width="20" height="20"></span><?php echo $list[$i]['name'] ?>
-                </div>
-                <div class="gall_info">
-                    <span class="sound_only">조회 </span><i class="fa fa-eye" aria-hidden="true"></i> <?php echo $list[$i]['wr_hit'] ?>
-                    <?php if ($is_good) { ?><span class="sound_only">추천</span><strong><i class="fa fa-thumbs-o-up" aria-hidden="true"></i> <?php echo $list[$i]['wr_good'] ?></strong><?php } ?>
-                    <?php if ($is_nogood) { ?><span class="sound_only">비추천</span><strong><i class="fa fa-thumbs-o-down" aria-hidden="true"></i> <?php echo $list[$i]['wr_nogood'] ?></strong><?php } ?>
-                    <span class="gall_date"><span class="sound_only">작성일 </span><i class="fa fa-clock-o" aria-hidden="true"></i> <?php echo $list[$i]['datetime2'] ?></span>
+                        </a>
+                    </div>
+                    <div class="gall_text_href">
+                        <?php
+                        // echo $list[$i]['icon_reply']; 갤러리는 reply 를 사용 안 할 것 같습니다. - 지운아빠 2013-03-04
+                        if ($is_category && $list[$i]['ca_name']) {
+                         ?>
+                        <a href="<?php echo $list[$i]['ca_name_href'] ?>" class="bo_cate_link"><?php echo $list[$i]['ca_name'] ?></a>
+                        <?php } ?>
+                        <a href="<?php echo $list[$i]['href'] ?>" class="bo_tit">
+                            <?php echo $list[$i]['subject'] ?>
+                            <?php if ($list[$i]['comment_cnt']) { ?><span class="sound_only">댓글</span><?php echo rtrim($list[$i]['comment_cnt']); ?><span class="sound_only">개</span><?php } ?>
+                            <?php
+                            // if ($list[$i]['link']['count']) { echo '['.$list[$i]['link']['count']}.']'; }
+                            // if ($list[$i]['file']['count']) { echo '<'.$list[$i]['file']['count'].'>'; }
+
+                            if (isset($list[$i]['icon_new'])) echo rtrim($list[$i]['icon_new']);
+                            if (isset($list[$i]['icon_hot'])) echo rtrim($list[$i]['icon_hot']);
+                            //if (isset($list[$i]['icon_file'])) echo rtrim($list[$i]['icon_file']);
+                            //if (isset($list[$i]['icon_link'])) echo rtrim($list[$i]['icon_link']);
+                            if (isset($list[$i]['icon_secret'])) echo rtrim($list[$i]['icon_secret']);
+                             ?>
+                         </a>
+                    </div>
+                    <div class="gall_name">
+                        <span class="sound_only">작성자 </span><span class="profile_img"><img src="<?php echo G5_THEME_IMG_URL ;?>/no_profile.gif" alt="프로필이미지" width="20" height="20"></span><?php echo $list[$i]['name'] ?>
+                    </div>
+                    <div class="gall_info">
+                        <span class="sound_only">조회 </span><i class="fa fa-eye" aria-hidden="true"></i> <?php echo $list[$i]['wr_hit'] ?>
+                        <?php if ($is_good) { ?><span class="sound_only">추천</span><strong><i class="fa fa-thumbs-o-up" aria-hidden="true"></i> <?php echo $list[$i]['wr_good'] ?></strong><?php } ?>
+                        <?php if ($is_nogood) { ?><span class="sound_only">비추천</span><strong><i class="fa fa-thumbs-o-down" aria-hidden="true"></i> <?php echo $list[$i]['wr_nogood'] ?></strong><?php } ?>
+                        <span class="gall_date"><span class="sound_only">작성일 </span><i class="fa fa-clock-o" aria-hidden="true"></i> <?php echo $list[$i]['datetime2'] ?></span>
+                    </div>
                 </div>
             </div>
         </li>
diff --git a/theme/basic/skin/board/gallery/style.css b/theme/basic/skin/board/gallery/style.css
index 3472a6821..b6de977f0 100644
--- a/theme/basic/skin/board/gallery/style.css
+++ b/theme/basic/skin/board/gallery/style.css
@@ -94,16 +94,31 @@ box-shadow:inset 0 2px 5px rgb(33, 135, 202);}
 
 /* 갤러리 목록 */
 #bo_gall h2 {margin:0;padding:0;width:1px;height:1px;font-size:0;line-height:0;overflow:hidden}
-#bo_gall #gall_ul {margin:10px 0 0;padding:0;list-style:none;zoom:1}
+#bo_gall #gall_ul {margin:10px -10px 0;padding:0;list-style:none;zoom:1}
 #bo_gall #gall_ul:after {display:block;visibility:hidden;clear:both;content:""}
-#bo_gall .gall_li {float:left;position:relative;margin:0 20px 30px 0 ;border:1px solid #ccc;background:#fff;border-radius:0 0 2px 2px}
+#bo_gall .gall_box {position:relative;margin:0 0 30px 0;border:1px solid #ccc;background:#fff;border-radius:0 0 2px 2px}
 #bo_gall .gall_li .gall_chk{position:absolute;top:0;left:0;padding:5px;}
 
+.gall_row .col-gn-0,.gall_row .col-gn-1,.gall_row .col-gn-2,.gall_row .col-gn-3,.gall_row .col-gn-4,.gall_row .col-gn-5,.gall_row .col-gn-6,.gall_row .col-gn-7,.gall_row .col-gn-8,.gall_row .col-gn-9,.gall_row .col-gn-10{position:relative;min-height:1px;padding-left:10px;*padding-left:0;padding-right:10px;*padding-right:0;float:left;-webkit-box-sizing:border-box;-moz-box-sizing:border-box;box-sizing:border-box;margin-left:0;}
+.gall_row .col-gn-0,.latest_row .col-gn-1{width:100%}
+.gall_row .col-gn-2{width:50%}
+.gall_row .col-gn-3{width:33.33333333%}
+.gall_row .col-gn-4{width:25%}
+.gall_row .col-gn-5{width:20%}
+.gall_row .col-gn-6{width:16.66666667%}
+.gall_row .col-gn-7{width:14.28571428%}
+.gall_row .col-gn-8{width:12.5%}
+.gall_row .col-gn-9{width:11.11111111%}
+.gall_row .col-gn-10{width:10%}
+
+.gall_row .box_clear{clear:both}
 
 #bo_gall .gall_now .gall_text_href a {color:#ff3061}
 
 #bo_gall .gall_href a:link, #bo_gall .gall_href a:focus, #bo_gall .gall_href a:hover {text-decoration:none}
-#bo_gall .gall_img{border-bottom:1px solid #eee}
+#bo_gall .gall_img{border-bottom:1px solid #eee;text-align:center}
+#bo_gall .gall_img a,#bo_gall .gall_img .no_image,#bo_gall .gall_img .is_notice{display:block}
+#bo_gall .gall_img img{max-width:100%;height:auto !important}
 #bo_gall .gall_img span{display:inline-block;background:#eee;text-align:center;line-height:150px;text-transform:uppercase;font-weight:bold;font-size:1.25em;color:#777}
 
 #bo_gall .gall_text_href {margin:10px}