firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

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

Browse Source
This commit is contained in:
gnuboard
2013-01-09 15:55:48 +09:00
parent c42445b92a 5705a13f61
commit 3b6d5c2e83
7 changed files with 122 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
skin/board/neo/list.skin.php
View File

@ -97,7 +97,7 @@ for ($i=0; $i<count($list); $i++) {
echo $list[$i]['num'];
?>
</td>
<? if ($is_checkbox) { ?><td><input type="checkbox" name="chk_wr_id[]" value="<?=$list[$i]['wr_id']?>" title="이 게시물 선택"></td><? } ?>
<? if ($is_checkbox) { ?><td class="td_chk"><input type="checkbox" name="chk_wr_id[]" value="<?=$list[$i]['wr_id']?>" title="이 게시물 선택"></td><? } ?>
<td class="td_subject">
<?
echo $list[$i]['reply'];

108
skin/board/neo/view.skin.php
View File

@ -2,50 +2,11 @@
if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
?>
<p id="bo_v_title"><strong><?=$board['bo_subject']?></strong></p>
<div id="bo_v">
<h1 id="bo_v_h1"><?=cut_hangul_last(get_text($view['wr_subject']))?></h1>
<aside>
<h2>게시물 상단 링크</h2>
<!-- 링크 버튼 -->
<? if ($update_href || $delete_href) {?>
<ul>
<? if ($update_href) { ?>
<li><a href="<?=$update_href?>">수정</a></li>
<? } ?>
<? if ($delete_href) { ?>
<li><a href="<?=$delete_href?>">삭제</a></li>
<? } ?>
</ul>
<? } ?>
<ul>
<?
ob_start();
?>
<? if ($copy_href) { ?>
<li><a href="<?=$copy_href?>">복사</a></li>
<? } ?>
<? if ($move_href) { ?>
<li><a href="<?=$move_href?>">이동</a></li>
<? } ?>
<? if ($search_href) { ?>
<li><a href="<?=$search_href?>">검색</a></li>
<? } ?>
<li><a href="<?=$list_href?>">목록</a></li>
<? if ($reply_href) { ?>
<li><a href="<?=$reply_href?>">답변</a></li>
<? } ?>
<? if ($write_href) { ?>
<li><a href="<?=$write_href?>">글쓰기</a></li>
<? } ?>
<?
$link_buttons = ob_get_contents();
ob_end_flush();
?>
</ul>
</aside>
<section id="bo_v_info">
<h2>게시물 정보</h2>
<dl>
@ -61,19 +22,38 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<dd><?=number_format($view['wr_hit'])?>회</dd>
<dt>댓글</dt>
<dd><?=number_format($view['wr_comment'])?>건</dd>
<? if ($is_good) { ?>
<dt>추천</dt>
<dd><?=number_format($view['wr_good'])?>회</dd>
<? } ?>
<? if ($is_nogood) { ?>
<dt>비추천</dt>
<dd><?=number_format($view['wr_nogood'])?>회</dd>
<? } ?>
</dl>
</section>
<aside id="bo_v_top">
<h2>게시물 상단 링크</h2>
<!-- 링크 버튼 -->
<? if ($update_href || $delete_href) {?>
<ul id="bo_v_my">
<? if ($update_href) { ?><li><a href="<?=$update_href?>" class="btn02">수정</a></li><? } ?>
<? if ($delete_href) { ?><li><a href="<?=$delete_href?>" class="btn02">삭제</a></li><? } ?>
</ul>
<? } ?>
<?
ob_start();
?>
<ul class="bo_v_com">
<? if ($copy_href) { ?><li><a href="<?=$copy_href?>" class="btn03">복사</a></li><? } ?>
<? if ($move_href) { ?><li><a href="<?=$move_href?>" class="btn03">이동</a></li><? } ?>
<? if ($search_href) { ?><li><a href="<?=$search_href?>" class="btn02">검색</a></li><? } ?>
<li><a href="<?=$list_href?>" class="btn02">목록</a></li>
<? if ($reply_href) { ?><li><a href="<?=$reply_href?>" class="btn02">답변</a></li><? } ?>
<? if ($write_href) { ?><li><a href="<?=$write_href?>" class="btn01">글쓰기</a></li><? } ?>
</ul>
<?
$link_buttons = ob_get_contents();
ob_end_flush();
?>
</aside>
<? if ($view['file'][$i]) {?>
<section>
<section id="bo_v_file">
<h2>첨부파일</h2>
<ul>
<?
@ -99,7 +79,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<? } ?>
<? if ($view['link'][$i]) {?>
<section>
<section id="bo_v_link">
<h2>관련링크</h2>
<ul>
<?
@ -124,7 +104,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
</section>
<? } ?>
<article>
<article id="bo_v_article">
<header>
<h1>본문</h1>
</header>
@ -145,11 +125,11 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<? if ($is_signature) { ?><p><?=$signature?></p><? } ?>
<? if ($scrap_href || $good_href || $nogood_href) { ?>
<ul>
<? if ($scrap_href) { ?><li><a href="javascript:;" onclick="win_scrap('<?=$scrap_href?>');">스크랩</a></li><? } ?>
<? if ($good_href) {?><li>추천 <?=number_format($view['wr_good'])?> <a href="<?=$good_href?>" target="hiddenframe">추천</a></li><? } ?>
<? if ($nogood_href) {?><li>비추천 <?=number_format($view['wr_nogood'])?> <a href="<?=$nogood_href?>" target="hiddenframe">비추천</a></li><? } ?>
</ul>
<div id="bo_v_act">
<? if ($scrap_href) { ?><a href="javascript:;" class="btn02" onclick="win_scrap('<?=$scrap_href?>');">스크랩</a><? } ?>
<? if ($good_href) {?><a href="<?=$good_href?>" class="btn02" target="hiddenframe">추천 <strong><?=number_format($view['wr_good'])?></strong></a><? } ?>
<? if ($nogood_href) {?><a href="<?=$nogood_href?>" class="btn02" target="hiddenframe">비추천 <strong><?=number_format($view['wr_nogood'])?></strong></a><? } ?>
</div>
<? } ?>
</article>
@ -158,17 +138,17 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
include_once('./view_comment.php');
?>
<aside>
<aside id="bo_v_bot">
<h2>게시물 하단 링크</h2>
<ul>
<? if ($prev_href) { ?><li><a href="<?=$prev_href?>">이전</a></li><? } ?>
<? if ($next_href) { ?><li><a href="<?=$next_href?>">다음</a></li><? } ?>
<? if ($prev_href || $next_href) { ?>
<ul id="bo_v_nb">
<? if ($prev_href) { ?><li><a href="<?=$prev_href?>" class="btn02">이전</a></li><? } ?>
<? if ($next_href) { ?><li><a href="<?=$next_href?>" class="btn02">다음</a></li><? } ?>
</ul>
<? } ?>
<!-- 링크 버튼 -->
<ul>
<?=$link_buttons?>
</ul>
<?=$link_buttons?>
</aside>
</div>

14
skin/board/neo/view_comment.skin.php
View File

@ -9,7 +9,7 @@ var char_max = parseInt(<?=$comment_max?>); // 최대
</script>
<!-- 댓글 리스트 -->
<section id="commentContents">
<section id="bo_vc">
<h2>댓글</h2>
<?
for ($i=0; $i<count($list); $i++) {
@ -24,10 +24,9 @@ var char_max = parseInt(<?=$comment_max?>); // 최대
//$str = preg_replace("/\[\<a\s.*href\=\"(http|https|ftp)\:\/\/([^[:space:]]+)\.(swf)\".*\<\/a\>\]/i", "<script>doc_write(flash_movie('$1://$2.$3'));</script>", $str);
$str = preg_replace("/\[\<a\s*href\=\"(http|https|ftp)\:\/\/([^[:space:]]+)\.(gif|png|jpg|jpeg|bmp)\"\s*[^\>]*\>[^\s]*\<\/a\>\]/i", "<img src='$1://$2.$3' id='target_resize_image[]' onclick='image_window(this);'>", $str);
?>
<article>
<article id="c_<?=$comment_id?>">
<header>
<h1><?=$list[$i]['name']?>님의 댓글</h1>
<a id="c_<?=$comment_id?>"></a>
<dl>
<dt>아이피</dt>
<dd><? if ($is_ip_view) { echo $list[$i]['ip'];} ?></dd>
@ -66,7 +65,8 @@ var char_max = parseInt(<?=$comment_max?>); // 최대
<input type="hidden" name="page" value="<?=$page?>">
<input type="hidden" name="is_good" value="">
<div id="comment_write">
<aside id="bo_vc_w">
<h2>댓글쓰기</h2>
<? if ($is_guest) { ?>
<label for="wr_name">이름</label> <input type="text" id="wr_name" name="wr_name" maxLength="20" size="10" required>
<label for="wr_password">패스워드</label> <input type="password" id="wr_password" name="wr_password" maxLength="20" size="10" required>
@ -79,14 +79,14 @@ var char_max = parseInt(<?=$comment_max?>); // 최대
<? if ($comment_min || $comment_max) { ?>onkeyup="check_byte('wr_content', 'char_count');"<?}?>></textarea>
<? if ($comment_min || $comment_max) { ?><script> check_byte('wr_content', 'char_count'); </script><?}?>
<input type="submit" value="댓글입력">
</div>
</aside>
</form>
<script src="<?=$g4['path']?>/js/jquery.kcaptcha.js"></script>
<script>
var save_before = '';
var save_html = document.getElementById('comment_write').innerHTML;
var save_html = document.getElementById('bo_vc_w').innerHTML;
function good_and_write()
{
@ -223,7 +223,7 @@ var char_max = parseInt(<?=$comment_max?>); // 최대
el_id = 'edit_' + comment_id;
}
else
el_id = 'comment_write';
el_id = 'bo_vc_w';
if (save_before != el_id)
{

8
skin/member/neo/scrap.skin.php
View File

@ -19,11 +19,11 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<tbody>
<? for ($i=0; $i<count($list); $i++) { ?>
<tr>
<td><?=$list[$i][num]?></td>
<td><a href="javascript:;" onclick="opener.document.location.href='<?=$list[$i][opener_href]?>';"><?=$list[$i][bo_subject]?></a></td>
<td class="td_num"><?=$list[$i][num]?></td>
<td class="td_board"><a href="javascript:;" onclick="opener.document.location.href='<?=$list[$i][opener_href]?>';"><?=$list[$i][bo_subject]?></a></td>
<td><a href="javascript:;" onclick="opener.document.location.href='<?=$list[$i][opener_href_wr_id]?>';"><?=$list[$i][subject]?></a></td>
<td><?=$list[$i][ms_datetime]?></td>
<td><a href="javascript:del('<?=$list[$i][del_href]?>');">삭제</a></td>
<td class="td_datetime"><?=$list[$i][ms_datetime]?></td>
<td class="td_mng"><a href="javascript:del('<?=$list[$i][del_href]?>');">삭제</a></td>
</tr>
<? } ?>

48
skin/member/neo/scrap_popin.skin.php
View File

@ -2,28 +2,34 @@
if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
?>
<h1>스크랩하기</h1>
<div id="scrap_do" class="new_win">
<h1>스크랩하기</h1>
<form name="f_scrap_popin" method="post" action="./scrap_popin_update.php">
<input type="hidden" name="bo_table" value="<?=$bo_table?>">
<input type="hidden" name="wr_id" value="<?=$wr_id?>">
<form name="f_scrap_popin" method="post" action="./scrap_popin_update.php">
<input type="hidden" name="bo_table" value="<?=$bo_table?>">
<input type="hidden" name="wr_id" value="<?=$wr_id?>">
<table>
<caption>스크랩 확인 및 댓글 달기</caption>
<tbody>
<tr>
<th scope="row">제목</th>
<td><?=get_text(cut_str($write[wr_subject], 255))?></td>
</tr>
<tr>
<th scope="row"><label for="wr_content">댓글</label></th>
<td><textarea id="wr_content" name="wr_content"></textarea></td>
</tr>
</tbody>
</table>
<table class="frm_tbl">
<caption>스크랩 확인 및 댓글 달기</caption>
<tbody>
<tr>
<th scope="row">제목</th>
<td><?=get_text(cut_str($write[wr_subject], 255))?></td>
</tr>
<tr>
<th scope="row"><label for="wr_content">댓글</label></th>
<td><textarea id="wr_content" name="wr_content"></textarea></td>
</tr>
</tbody>
</table>
</form>
</form>
<div class="btn_window">
<input type="submit" value="스크랩">
</div>
<p>
스크랩을 하시면서 감사 혹은 격려의 댓글을 남기실 수 있습니다.
</p>
<div class="btn_window">
<input type="submit" value="스크랩">
</div>
</div>