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

This commit is contained in:
gnuboard
2013-01-11 10:59:54 +09:00
13 changed files with 224 additions and 162 deletions

View File

@ -11,50 +11,26 @@ if ($is_nogood) $colspan++;
<? if (!$wr_id) {?><h1><?=$g4['title']?></h1><?}?>
<? if ($admin_href) { ?><div id="btn_bo_adm"><a href="<?=$admin_href?>">게시판 관리자 바로가기</a></div><?}?>
<? if ($admin_href) { ?><div id="btn_bo_adm"></div><?}?>
<div id="bo_cate">
<? if ($is_category) { ?>
<form id="fcategory" name="fcategory" method="get">
<select name="sca" onchange="location='<?=$category_location?>'+<?=strtolower($g4['charset'])=='utf-8' ? "encodeURIComponent(this.value)" : "this.value"?>;">
<option value=''>전체</option>
<?=$category_option?>
</select>
</form>
<? } ?>
<span>Total <?=number_format($total_count)?>건</span>
<?=$page?> 페이지
</div>
<div class="btn_bo">
<fieldset id="bo_sch">
<legend>게시물 검색</legend>
<form name="fsearch" method="get">
<input type="hidden" name="bo_table" value="<?=$bo_table?>">
<input type="hidden" name="sca" value="<?=$sca?>">
<select name="sfl" title="검색대상">
<option value="wr_subject">제목</option>
<option value="wr_content">내용</option>
<option value="wr_subject||wr_content">제목+내용</option>
<option value="mb_id,1">회원아이디</option>
<option value="mb_id,0">회원아이디(코)</option>
<option value="wr_name,1">글쓴이</option>
<option value="wr_name,0">글쓴이(코)</option>
<div class="bo_link">
<div id="bo_cate">
<? if ($is_category) { ?>
<form id="fcategory" name="fcategory" method="get">
<select name="sca" onchange="location='<?=$category_location?>'+<?=strtolower($g4['charset'])=='utf-8' ? "encodeURIComponent(this.value)" : "this.value"?>;">
<option value=''>전체</option>
<?=$category_option?>
</select>
<input name="stx" class="fieldset_input required" maxlength="15" size="15" required value="<?=stripslashes($stx)?>" title="검색어">
<input type="radio" id="sop_and" name="sop" value="and">
<label for="sop_and">and</label>
<input type="radio" id="sop_or" name="sop" value="or">
<label for="sop_or">or</label>
<input type="submit" class="fieldset_submit" value="검색">
</form>
</fieldset>
<? } ?>
<span>Total <?=number_format($total_count)?>건</span>
<?=$page?> 페이지
</div>
<? if ($rss_href || $write_href) {?>
<ul class="btn_bo_user">
<? if ($rss_href) { ?><li><a href="<?=$rss_href?>" class="btn02">RSS</a></li><? } ?>
<? if ($admin_href) { ?><li><a href="<?=$admin_href?>" class="btn03">관리자</a></li><? } ?>
<? if ($write_href) { ?><li><a href="<?=$write_href?>" class="btn01">글쓰기</a></li><? } ?>
</ul>
<? } ?>
@ -136,15 +112,15 @@ for ($i=0; $i<count($list); $i++) {
</table>
</form>
<div class="btn_bo">
<div class="bo_link">
<ul class="btn_bo_adm">
<? if ($list_href) { ?>
<li><a href="<?=$list_href?>">목록</a></li>
<li><a href="<?=$list_href?>" class="btn02">목록</a></li>
<? } ?>
<? if ($is_checkbox) { ?>
<li><a href="javascript:select_delete();" class="btn03">선택삭제</a></li>
<li><a href="javascript:select_copy('copy');" class="btn03">선택복사</a></li>
<li><a href="javascript:select_copy('move');" class="btn03">선택이동</a></li>
<li><a href="javascript:select_delete();" class="btn02">선택삭제</a></li>
<li><a href="javascript:select_copy('copy');" class="btn02">선택복사</a></li>
<li><a href="javascript:select_copy('move');" class="btn02">선택이동</a></li>
<? } ?>
</ul>
@ -160,6 +136,31 @@ for ($i=0; $i<count($list); $i++) {
<? if ($next_part_href) { echo '<a href="'.$next_part_href.'">다음검색</a>'; } ?>
</div>
<fieldset id="bo_sch">
<legend>게시물 검색</legend>
<form name="fsearch" method="get">
<input type="hidden" name="bo_table" value="<?=$bo_table?>">
<input type="hidden" name="sca" value="<?=$sca?>">
<select name="sfl" title="검색대상">
<option value="wr_subject">제목</option>
<option value="wr_content">내용</option>
<option value="wr_subject||wr_content">제목+내용</option>
<option value="mb_id,1">회원아이디</option>
<option value="mb_id,0">회원아이디(코)</option>
<option value="wr_name,1">글쓴이</option>
<option value="wr_name,0">글쓴이(코)</option>
</select>
<input name="stx" class="fieldset_input required" maxlength="15" size="15" required value="<?=stripslashes($stx)?>" title="검색어">
<input type="radio" id="sop_and" name="sop" value="and">
<label for="sop_and">and</label>
<input type="radio" id="sop_or" name="sop" value="or">
<label for="sop_or">or</label>
<input type="submit" class="fieldset_submit" value="검색">
</form>
</fieldset>
<script>
if ('<?=$sca?>') document.fcategory.sca.value = '<?=$sca?>';
if ('<?=$stx?>') {

View File

@ -15,7 +15,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<dd><?=($category_name ? "{$view['ca_name']} " : "");?></dd>
<? } ?>
<dt>작성자</dt>
<dd><?=$view['name']?><? if ($is_ip_view) { echo "&nbsp;($ip)"; } ?></dd>
<dd><div><?=$view['name']?><? if ($is_ip_view) { echo "&nbsp;($ip)"; } ?></div></dd>
<dt>작성일</dt>
<dd><?=date("y-m-d H:i", strtotime($view['wr_datetime']))?></dd>
<dt>조회</dt>
@ -79,18 +79,12 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<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 ($update_href) { ?><li><a href="<?=$update_href?>" class="btn02">수정</a></li><? } ?>
<? if ($delete_href) { ?><li><a href="<?=$delete_href?>" class="btn02">삭제</a></li><? } ?>
<? 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><? } ?>
@ -104,7 +98,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
?>
</aside>
<article id="bo_v_article">
<article id="bo_v_atc">
<header>
<h1>본문</h1>
</header>
@ -166,10 +160,10 @@ function file_download(link, file) {
<script>
// 이미지 등비율 리사이징
$(document).ready(function(){
var img = $('article img');
var img = $('#bo_v_atc img');
var img_org_width = img.width();
$(window).resize(function(){
var wrapper_width = $('#wrapper').width();
var wrapper_width = $('#bo_v_atc').width();
img.each(function() {
var img_width = $(this).width();
if (img_width > wrapper_width) {

View File

@ -73,17 +73,19 @@ var char_max = parseInt(<?=$comment_max?>); // 최대
<h2>댓글쓰기</h2>
<fieldset>
<? if ($is_guest) { ?>
<label for="wr_name">이름</label> <input type="text" id="wr_name" name="wr_name" class="fieldset_input" maxLength="20" size="10" required>
<label for="wr_password">패스워드</label> <input type="password" id="wr_password" name="wr_password" class="fieldset_input" maxLength="20" size="10" required>
<label for="wr_name">이름</label> <input type="text" id="wr_name" name="wr_name" class="fieldset_input required" maxLength="20" size="5" required>
<label for="wr_password">패스워드</label> <input type="password" id="wr_password" name="wr_password" class="fieldset_input required" maxLength="20" size="10" required>
<? echo $captcha_html; ?>
<? } ?>
<input type="checkbox" id="wr_secret" name="wr_secret" value="secret">
<label for="wr_secret">비밀글</label>
<? if ($comment_min || $comment_max) { ?><strong id="char_cnt"><span id="char_count"></span>글자</strong><?}?>
<textarea id="wr_content" name="wr_content" required
<? 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" class="fieldset_submit" value="댓글입력">
<div id="bo_vc_warea">
<textarea id="wr_content" name="wr_content" required
<? 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" class="bo_vc_submit" value="댓글입력">
</div>
</fieldset>
</aside>

View File

@ -106,7 +106,7 @@ if ($option) {
<tr>
<th scope="row"><label for="wr_subject">제목</label></th>
<td><input id="wr_subject" name="wr_subject" class="frm_input required" size="60" required value="<?=$subject?>" title="제목"></td>
<td><input id="wr_subject" name="wr_subject" class="frm_input required" size="50" required value="<?=$subject?>" title="제목"></td>
</tr>
<tr>
@ -121,7 +121,7 @@ if ($option) {
<? for ($i=1; $is_link && $i<=$g4['link_count']; $i++) { ?>
<tr>
<th scope="row"><label for="wr_link<?=$i?>">링크 #<?=$i?></label></th>
<td><input type="text" id="wr_link<?=$i?>" name="wr_link<?=$i?>" class="frm_input" size="60" value="<?if($w=="u"){echo$write['wr_link'.$i];}?>"></td>
<td><input type="text" id="wr_link<?=$i?>" name="wr_link<?=$i?>" class="frm_input" size="50" value="<?if($w=="u"){echo$write['wr_link'.$i];}?>"></td>
</tr>
<? } ?>

View File

@ -41,7 +41,7 @@ var member_skin_path = "<?=$member_skin_path?>";
<tr>
<th scope="row"><label for="reg_mb_name">이름</label></th>
<td>
<input id="reg_mb_name" name="mb_name" class="frm_input hangul <?=$required?> <?=$readonly?>" value="<?=$member['mb_name']?>" <?=$required?> <?=$readonly?> title="이름">
<input id="reg_mb_name" name="mb_name" class="frm_input hangul <?=$required?> <?=$readonly?>" value="<?=$member['mb_name']?>" size="10" <?=$required?> <?=$readonly?> title="이름">
<? if ($w=='') { echo "<span class=\"frm_info\">공백없이 한글만 입력하세요.</span>"; } ?>
</td>
</tr>
@ -50,7 +50,7 @@ var member_skin_path = "<?=$member_skin_path?>";
<th scope="row"><label for="reg_mb_nick">별명</label></th>
<td>
<input type="hidden" name="mb_nick_default" value="<?=isset($member['mb_nick'])?$member['mb_nick']:'';?>">
<input type="text" id="reg_mb_nick" name="mb_nick" class="frm_input required" maxlength="20" value="<?=isset($member['mb_nick'])?$member['mb_nick']:'';?>" required title="별명">
<input type="text" id="reg_mb_nick" name="mb_nick" class="frm_input required" maxlength="20" size="10" value="<?=isset($member['mb_nick'])?$member['mb_nick']:'';?>" required title="별명">
<span id="msg_mb_nick"></span>
<span class="frm_info">
공백없이 한글,영문,숫자만 입력 가능 (한글2자, 영문4자 이상)<br>
@ -64,7 +64,7 @@ var member_skin_path = "<?=$member_skin_path?>";
<th scope="row"><label for="reg_mb_email">E-mail</label></th>
<td>
<input type="hidden" name="old_email" value="<?=$member['mb_email']?>">
<input type="text" id="reg_mb_email" name="mb_email" class="frm_input email <?=$config['cf_use_email_certify']?"required":"";?>" maxlength="100" value='<?=isset($member['mb_email'])?$member['mb_email']:'';?>' <?=$config['cf_use_email_certify']?"required":"";?> title="E-mail">
<input type="text" id="reg_mb_email" name="mb_email" class="frm_input email <?=$config['cf_use_email_certify']?"required":"";?>" maxlength="100" size="50" value='<?=isset($member['mb_email'])?$member['mb_email']:'';?>' <?=$config['cf_use_email_certify']?"required":"";?> title="E-mail">
<span id="msg_mb_email"></span>
<? if ($config['cf_use_email_certify']) { ?>
<span class="frm_info">
@ -162,7 +162,7 @@ var member_skin_path = "<?=$member_skin_path?>";
</tr>
<? } ?>
<? if (isset($member['mb_open_date']) && $member['mb_open_date'] <= date("Y-m-d", $g4['server_time'] - ($config['cf_open_modify'] * 86400))) { // 정보공개 수정일이 지났다면 수정가능 ?>
<? if (isset($member['mb_open_date']) && $member['mb_open_date'] <= date("Y-m-d", $g4['server_time'] - ($config['cf_open_modify'] * 86400)) || !$member['mb_open_date']) { // 정보공개 수정일이 지났다면 수정가능 ?>
<tr>
<th scope="row"><label for="reg_mb_open">정보공개</label></th>
<td>
@ -195,7 +195,7 @@ var member_skin_path = "<?=$member_skin_path?>";
<? } ?>
</table>
<?=get_captcha("wr_key", 1);?>
<?=$captcha_html?>
<div class="btn_confirm">
<input type="submit" value="회원가입" accesskey="s">