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

This commit is contained in:
whitedot
2013-02-22 17:18:55 +09:00
5 changed files with 15 additions and 8 deletions

View File

@ -94,7 +94,7 @@ if ($write['wr_reply'] == '' && ($is_admin == 'super' || $is_admin == 'group'))
$scrap_href = '';
$good_href = '';
$nogood_href = '';
if ($member['mb_id']) {
if ($is_member) {
// 스크랩 링크
$scrap_href = './scrap_popin.php?bo_table='.$bo_table.'&wr_id='.$wr_id;

View File

@ -12,7 +12,7 @@ if ($is_nogood) $colspan++;
<? if (!$wr_id) {?><h1 id="bo_list_title"><?=$g4['title']?></h1><?}?>
<!-- 게시판 목록 시작 -->
<div id="bo_list">
<div id="bo_list" style="width:<?=$width;?>">
<? if ($is_category) { ?>
<form id="fcategory" name="fcategory" method="get">

View File

@ -3,7 +3,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
include_once(G4_LIB_PATH.'/thumbnail.lib.php');
?>
<div id="bo_v">
<div id="bo_v" style="width:<?=$width;?>">
<p id="bo_v_cate">
<?=$board['bo_subject']?>
@ -147,7 +147,17 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
<? if ($good_href) {?><a href="<?=$good_href?>" class="btn_b01" target="hiddenframe">추천 <strong><?=number_format($view['wr_good'])?></strong></a><? } ?>
<? if ($nogood_href) {?><a href="<?=$nogood_href?>" class="btn_b01" target="hiddenframe">비추천 <strong><?=number_format($view['wr_nogood'])?></strong></a><? } ?>
</div>
<? } ?>
<? } else {
if($board['bo_use_good'] || $board['bo_use_nogood']) {
?>
<div id="bo_v_act">
<? if($board['bo_use_good']) { ?><strong><?=number_format($view['wr_good'])?></strong><? } ?>
<? if($board['bo_use_nogood']) { ?><strong><?=number_format($view['wr_nogood'])?></strong><? } ?>
</div>
<?
}
}
?>
</article>
<?

View File

@ -280,9 +280,6 @@ var char_max = parseInt(<?=$comment_max?>); // 최대
save_before = el_id;
}
if (typeof(wrestInitialized) != 'undefined')
wrestInitialized();
}
function comment_delete(url)

View File

@ -4,7 +4,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<h1 id="wrapper_title"><?=$g4['title']?></h1>
<form id="fwrite" name="fwrite" method="post" action="<?=$action_url?>" onsubmit="return fwrite_submit(this);" enctype="multipart/form-data" autocomplete="off">
<form id="fwrite" name="fwrite" method="post" action="<?=$action_url?>" onsubmit="return fwrite_submit(this);" enctype="multipart/form-data" autocomplete="off" style="width:<?=$width;?>">
<input type="hidden" name="w" value="<?=$w?>">
<input type="hidden" name="bo_table" value="<?=$bo_table?>">
<input type="hidden" name="wr_id" value="<?=$wr_id?>">