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

This commit is contained in:
chicpro
2013-04-15 14:17:08 +09:00
2 changed files with 3 additions and 4 deletions

View File

@ -54,7 +54,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
$k += 1; $k += 1;
if ($k % $bo_gallery_cols == 0) $style .= "margin:0 !important;"; if ($k % $bo_gallery_cols == 0) $style .= "margin:0 !important;";
?> ?>
<li class="bo_img_list_li <? if ($wr_id == $list[$i]['wr_id']) { ?>bo_img_now<? } ?>" style="<?=$style?>"> <li class="bo_img_list_li <? if ($wr_id == $list[$i]['wr_id']) { ?>bo_img_now<? } ?>" style="<?=$style?>width:<?=$board['bo_gallery_width']?>px">
<? if ($is_checkbox) { ?><input type="checkbox" name="chk_wr_id[]" value="<?=$list[$i]['wr_id']?>" title="<?=$list[$i]['wr_subject']?> 선택"><? } ?> <? if ($is_checkbox) { ?><input type="checkbox" name="chk_wr_id[]" value="<?=$list[$i]['wr_id']?>" title="<?=$list[$i]['wr_subject']?> 선택"><? } ?>
<span class="sound_only"> <span class="sound_only">
<? <?
@ -70,8 +70,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
<? <?
if ($list[$i]['is_notice']) { // 공지사항 ?> if ($list[$i]['is_notice']) { // 공지사항 ?>
<strong style="width:<?=$board['bo_gallery_width']?>px;height:<?=$board['bo_gallery_height']?>px">공지</strong> <strong style="width:<?=$board['bo_gallery_width']?>px;height:<?=$board['bo_gallery_height']?>px">공지</strong>
<? <? } else {
} else {
$thumb = get_list_thumbnail($board['bo_table'], $list[$i]['wr_id'], $board['bo_gallery_width'], $board['bo_gallery_height']); $thumb = get_list_thumbnail($board['bo_table'], $list[$i]['wr_id'], $board['bo_gallery_width'], $board['bo_gallery_height']);
if($thumb['src']) { if($thumb['src']) {

View File

@ -31,7 +31,7 @@
.bo_img_href a:focus, .bo_img_href a:focus,
.bo_img_href a:hover {text-decoration:none} .bo_img_href a:hover {text-decoration:none}
.bo_img_href strong, .bo_img_href strong,
.bo_img_href span {display:block;background:#f7f7f7;text-align:center;line-height:10em} .bo_img_href span {display:inline-block;background:#f7f7f7;text-align:center;line-height:10em}
.bo_img_text_href {margin:10px 0 !important} .bo_img_text_href {margin:10px 0 !important}
.bo_img_text_href a {font-weight:bold} .bo_img_text_href a {font-weight:bold}