From 1afb5a76caef8c92d1dbd1e3f31b166333a8dda4 Mon Sep 17 00:00:00 2001 From: thisgun Date: Thu, 9 Nov 2017 16:36:38 +0900 Subject: [PATCH 1/2] =?UTF-8?q?=EB=A6=AC=EB=89=B4=EC=96=BC=20=EC=88=98?= =?UTF-8?q?=EC=A0=95?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- index.php | 1 + install/install_db.php | 93 +++++++++++++++++++ skin/latest/pic_basic/latest.skin.php | 2 +- theme/basic/index.php | 1 + .../skin/latest/pic_basic/latest.skin.php | 2 +- 5 files changed, 97 insertions(+), 2 deletions(-) diff --git a/index.php b/index.php index d3179e2b1..045a07bb9 100644 --- a/index.php +++ b/index.php @@ -29,6 +29,7 @@ include_once(G5_PATH.'/head.php'); where a.bo_device <> 'mobile' "; if(!$is_admin) $sql .= " and a.bo_use_cert = '' "; + $sql .= " and a.bo_table not in ('notice', 'gallery') "; //공지사항과 갤러리 게시판은 제외 $sql .= " order by b.gr_order, a.bo_order "; $result = sql_query($sql); for ($i=0; $row=sql_fetch_array($result); $i++) { diff --git a/install/install_db.php b/install/install_db.php index 1612d09b6..052d4de6a 100644 --- a/install/install_db.php +++ b/install/install_db.php @@ -202,6 +202,99 @@ sql_query(" insert into `{$table_prefix}content` set co_id = 'provision', co_htm // FAQ Master sql_query(" insert into `{$table_prefix}faq_master` set fm_id = '1', fm_subject = '자주하시는 질문' ", true, $dblink); + +$tmp_gr_id = defined('G5_YOUNGCART_VER') ? 'shop' : 'community'; +$tmp_gr_subject = defined('G5_YOUNGCART_VER') ? '쇼핑몰' : '커뮤니티'; + +// 게시판 그룹 생성 +sql_query(" insert into `{$table_prefix}group` set gr_id = '$tmp_gr_id', gr_subject = '$tmp_gr_subject' ", true, $dblink); + +// 게시판 생성 +$tmp_bo_table = array ("notice", "qa", "free", "gallery"); +$tmp_bo_subject = array ("공지사항", "질문답변", "자유게시판", "갤러리"); +for ($i=0; $i
  • DB설정 완료
    • diff --git a/skin/latest/pic_basic/latest.skin.php b/skin/latest/pic_basic/latest.skin.php index 0ce837eb7..8c68d3ee2 100644 --- a/skin/latest/pic_basic/latest.skin.php +++ b/skin/latest/pic_basic/latest.skin.php @@ -18,7 +18,7 @@ $thumb_height = 150; if($thumb['src']) { $img = $thumb['src']; } else { - $img = $latest_skin_path.'/img/no_img.gif'; + $img = $latest_skin_url.'/img/no_img.gif'; } $img_content = ''.$thumb['alt'].''; ?> diff --git a/theme/basic/index.php b/theme/basic/index.php index 7797ce556..f7bd1020b 100644 --- a/theme/basic/index.php +++ b/theme/basic/index.php @@ -22,6 +22,7 @@ include_once(G5_THEME_PATH.'/head.php'); where a.bo_device <> 'mobile' "; if(!$is_admin) $sql .= " and a.bo_use_cert = '' "; + $sql .= " and a.bo_table not in ('notice', 'gallery') "; //공지사항과 갤러리 게시판은 제외 $sql .= " order by b.gr_order, a.bo_order "; $result = sql_query($sql); for ($i=0; $row=sql_fetch_array($result); $i++) { diff --git a/theme/basic/skin/latest/pic_basic/latest.skin.php b/theme/basic/skin/latest/pic_basic/latest.skin.php index 0ce837eb7..8c68d3ee2 100644 --- a/theme/basic/skin/latest/pic_basic/latest.skin.php +++ b/theme/basic/skin/latest/pic_basic/latest.skin.php @@ -18,7 +18,7 @@ $thumb_height = 150; if($thumb['src']) { $img = $thumb['src']; } else { - $img = $latest_skin_path.'/img/no_img.gif'; + $img = $latest_skin_url.'/img/no_img.gif'; } $img_content = ''.$thumb['alt'].''; ?> From a402501c6fe649cd47ed90a6ff8ec9d6deb50c31 Mon Sep 17 00:00:00 2001 From: thisgun Date: Fri, 10 Nov 2017 10:59:20 +0900 Subject: [PATCH 2/2] =?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 = '
      - + 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']) {

      네이버 CallbackURL

      -

      /?hauth.done=Naver

      +

      @@ -1035,8 +1035,7 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {

      카카오 웹 Redirect Path

      - - +

      @@ -1045,7 +1044,7 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {

      페이스북 CallbackURL

      -

      /?hauth.done=Facebook

      +

      @@ -1053,7 +1052,7 @@ if ($config['cf_sms_use'] && $config['cf_icode_id'] && $config['cf_icode_pw']) {

      구글 CallbackURL

      -

      /?hauth.done=Google

      +

      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; }"> ( ) -

      +
      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', 0 -
        +
          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'; + } ?> -
        • -
          - - - - - - 열람중"; - else - echo $list[$i]['num']; - ?> - -
          -
          -
          - +
        • +
          +
          + + + + + - 공지 - '; - } else { - $img_content = 'no image'; - } - - echo $img_content; - } + if ($wr_id == $list[$i]['wr_id']) + echo "열람중"; + else + echo $list[$i]['num']; ?> - +
          -
          - - - - - - 댓글개 +
          +
          + '; } + if ($list[$i]['is_notice']) { // 공지사항 ?> + 공지 + '; + } else { + $img_content = 'no image'; + } + + echo $img_content; + } ?> - -
          -
          - 작성자 프로필이미지 -
          -
          - 조회 - 추천 - 비추천 - 작성일 + +
          +
          + + + + + + 댓글개 + '; } + + 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']); + ?> + +
          +
          + 작성자 프로필이미지 +
          +
          + 조회 + 추천 + 비추천 + 작성일 +
          • 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('', 0 -
            +
              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'; + } ?> -
            • -
              - - - - - - 열람중"; - else - echo $list[$i]['num']; - ?> - -
              -
              -
              - +
            • +
              +
              + + + + + - 공지 - '; - } else { - $img_content = 'no image'; - } - - echo $img_content; - } + if ($wr_id == $list[$i]['wr_id']) + echo "열람중"; + else + echo $list[$i]['num']; ?> - +
              -
              - - - - - - 댓글개 +
              +
              + '; } + if ($list[$i]['is_notice']) { // 공지사항 ?> + 공지 + '; + } else { + $img_content = 'no image'; + } + + echo $img_content; + } ?> - -
              -
              - 작성자 프로필이미지 -
              -
              - 조회 - 추천 - 비추천 - 작성일 + +
              +
              + + + + + + 댓글개 + '; } + + 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']); + ?> + +
              +
              + 작성자 프로필이미지 +
              +
              + 조회 + 추천 + 비추천 + 작성일 +
              • 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}