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:
whitedot
2013-03-06 13:53:47 +09:00
parent 86cd84a94e d5fb321d0f
commit 0dcda0c71f
5 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
js/wrest.js
View File

@ -22,12 +22,12 @@ function wrestItemname(fld)
var text = el.innerHTML.replace(/[<].*[>].*[<]\/+.*[>]/gi, "");
if(text == '') {
return fld.getAttribute("title") ? fld.getAttribute("title") : ( fld.getAttribute("alt") ? fld.getAttribute("alt") : fld.name );
return fld.getAttribute("title") ? fld.getAttribute("title") : ( fld.getAttribute("placeholder") ? fld.getAttribute("placeholder") : fld.name );
} else {
return text;
}
} else {
return fld.getAttribute("title") ? fld.getAttribute("title") : ( fld.getAttribute("alt") ? fld.getAttribute("alt") : fld.name );
return fld.getAttribute("title") ? fld.getAttribute("title") : ( fld.getAttribute("placeholder") ? fld.getAttribute("placeholder") : fld.name );
}
}

26
skin/board/gallery/list.skin.php
View File

@ -9,7 +9,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
<div id="bo_img" style="width:<?=$width;?>">
<? if ($is_category) { ?>
<form id="fcategory" name="fcategory" method="get">
<form name="fcategory" id="fcategory" method="get">
<nav id="bo_cate">
<h2><?=$board['bo_subject']?> 카테고리</h2>
<ul id="bo_cate_ul">
@ -34,7 +34,7 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
<? } ?>
</div>
<form id="fboardlist" name="fboardlist" method="post" action="./board_list_update.php" onsubmit="return fboardlist_submit(this);">
<form name="fboardlist" id="fboardlist" action="./board_list_update.php" onsubmit="return fboardlist_submit(this);" method="post">
<input type="hidden" name="bo_table" value="<?=$bo_table?>">
<input type="hidden" name="sfl" value="<?=$sfl?>">
<input type="hidden" name="stx" value="<?=$stx?>">
@ -126,9 +126,9 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
<li><a href="<?=$list_href?>" class="btn_b01"> 목록</a></li>
<? } ?>
<? if ($is_checkbox) { ?>
<li><input type="submit" name="btn_submit" onclick="document.pressed=this.value" value="선택삭제"></li>
<li><input type="submit" name="btn_submit" onclick="document.pressed=this.value" value="선택복사"></li>
<li><input type="submit" name="btn_submit" onclick="document.pressed=this.value" value="선택이동"></li>
<li><input type="submit" name="btn_submit" value="선택삭제" onclick="document.pressed=this.value"></li>
<li><input type="submit" name="btn_submit" value="선택복사" onclick="document.pressed=this.value"></li>
<li><input type="submit" name="btn_submit" value="선택이동" onclick="document.pressed=this.value"></li>
<? } ?>
</ul>
@ -158,15 +158,15 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
<input type="hidden" name="sca" value="<?=$sca?>">
<input type="hidden" name="sop" value="and">
<select name="sfl" title="검색대상">
<option value="wr_subject"<?=get_selected($sfl, 'wr_subject', true);?>>제목</option>
<option value="wr_content"<?=get_selected($sfl, 'wr_content');?>>내용</option>
<option value="wr_subject||wr_content"<?=get_selected($sfl, 'wr_subject||wr_content');?>>제목+내용</option>
<option value="mb_id,1"<?=get_selected($sfl, 'mb_id,1');?>>회원아이디</option>
<option value="mb_id,0"<?=get_selected($sfl, 'mb_id,0');?>>회원아이디(코)</option>
<option value="wr_name,1"<?=get_selected($sfl, 'wr_name,1');?>>글쓴이</option>
<option value="wr_name,0"<?=get_selected($sfl, 'wr_name,0');?>>글쓴이(코)</option>
<option value="wr_subject"<?=get_selected($sfl, "wr_subject", true);?>>제목</option>
<option value="wr_content"<?=get_selected($sfl, "wr_content");?>>내용</option>
<option value="wr_subject||wr_content"<?=get_selected($sfl, "wr_subject||wr_content");?>>제목+내용</option>
<option value="mb_id,1"<?=get_selected($sfl, "mb_id,1");?>>회원아이디</option>
<option value="mb_id,0"<?=get_selected($sfl, "mb_id,0");?>>회원아이디(코)</option>
<option value="wr_name,1"<?=get_selected($sfl, "wr_name,1");?>>글쓴이</option>
<option value="wr_name,0"<?=get_selected($sfl, "wr_name,0");?>>글쓴이(코)</option>
</select>
<input name="stx" class="fs_input required" maxlength="15" size="15" required value="<?=stripslashes($stx)?>" title="검색어(필수)">
<input name="stx" value="<?=stripslashes($stx)?>" title="검색어(필수)" required class="fs_input required" size="15" maxlength="15">
<input type="submit" class="fs_submit" value="검색">
</form>
</fieldset>

6
skin/board/gallery/view.skin.php
View File

@ -143,9 +143,9 @@ include_once(G4_LIB_PATH.'/thumbnail.lib.php');
<? if ($scrap_href || $good_href || $nogood_href) { ?>
<div id="bo_v_act">
<? if ($scrap_href) { ?><a href="<?=$scrap_href; ?>" target="_blank" onclick="win_scrap(this.href); return false;" class="btn_b01">스크랩</a><? } ?>
<? 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><? } ?>
<? if ($scrap_href) { ?><a href="<?=$scrap_href; ?>" target="_blank" class="btn_b01" onclick="win_scrap(this.href); return false;">스크랩</a><? } ?>
<? if ($good_href) {?><a href="<?=$good_href?>" target="hiddenframe" class="btn_b01">추천 <strong><?=number_format($view['wr_good'])?></strong></a><? } ?>
<? if ($nogood_href) {?><a href="<?=$nogood_href?>" target="hiddenframe" class="btn_b01">비추천 <strong><?=number_format($view['wr_nogood'])?></strong></a><? } ?>
</div>
<? } else {
if($board['bo_use_good'] || $board['bo_use_nogood']) {

16
skin/board/gallery/view_comment.skin.php
View File

@ -46,7 +46,7 @@ var char_max = parseInt(<?=$comment_max?>); // 최대
<span id="edit_<?=$comment_id?>"></span><!-- 수정 -->
<span id="reply_<?=$comment_id?>"></span><!-- 답변 -->
<input type="hidden" id="secret_comment_<?=$comment_id?>" value="<?=strstr($list[$i]['wr_option'],"secret")?>">
<input type="hidden" value="<?=strstr($list[$i]['wr_option'],"secret")?>" id="secret_comment_<?=$comment_id?>">
<textarea id="save_comment_<?=$comment_id?>" style="display:none"><?=get_text($list[$i]['content1'], 0)?></textarea>
<? if($list[$i]['is_reply'] || $list[$i]['is_edit'] || $list[$i]['is_del']) {
@ -81,11 +81,11 @@ var char_max = parseInt(<?=$comment_max?>); // 최대
?>
<aside id="bo_vc_w">
<h2>댓글쓰기</h2>
<form name="fviewcomment" method="post" action="./write_comment_update.php" onsubmit="return fviewcomment_submit(this);" autocomplete="off">
<input type="hidden" id="w" name="w" value="<?=$w?>">
<form name="fviewcomment" action="./write_comment_update.php" onsubmit="return fviewcomment_submit(this);" method="post" autocomplete="off">
<input type="hidden" name="w" value="<?=$w?>" id="w" >
<input type="hidden" name="bo_table" value="<?=$bo_table?>">
<input type="hidden" name="wr_id" value="<?=$wr_id?>">
<input type="hidden" id="comment_id" name="comment_id" value="<?=$c_id?>">
<input type="hidden" name="comment_id" value="<?=$c_id?>" id="comment_id">
<input type="hidden" name="sca" value="<?=$sca?>">
<input type="hidden" name="sfl" value="<?=$sfl?>">
<input type="hidden" name="stx" value="<?=$stx?>">
@ -98,16 +98,16 @@ var char_max = parseInt(<?=$comment_max?>); // 최대
<? if ($is_guest) { ?>
<tr>
<th scope="row"><label for="wr_name">이름<strong class="sound_only">필수</strong></label></th>
<td><input type="text" id="wr_name" name="wr_name" class="frm_input required" maxLength="20" size="5" required></td>
<td><input type="text" name="wr_name" id="wr_name" required class="frm_input required" size="5" maxLength="20"></td>
</tr>
<tr>
<th scope="row"><label for="wr_password">패스워드<strong class="sound_only">필수</strong></label></th>
<td><input type="password" id="wr_password" name="wr_password" class="frm_input required" maxLength="20" size="10" required></td>
<td><input type="password" name="wr_password" id="wr_password" required class="frm_input required" size="10" maxLength="20"></td>
</tr>
<? } ?>
<tr>
<th scope="row"><label for="wr_secret">비밀글사용</label></th>
<td><input type="checkbox" id="wr_secret" name="wr_secret" value="secret"></td>
<td><input type="checkbox" name="wr_secret" value="secret" id="wr_secret"></td>
</tr>
<? if ($is_guest) { ?>
<tr>
@ -119,7 +119,7 @@ var char_max = parseInt(<?=$comment_max?>); // 최대
<th scope="row">내용</th>
<td>
<? if ($comment_min || $comment_max) { ?><strong id="char_cnt"><span id="char_count"></span>글자</strong><?}?>
<textarea id="wr_content" name="wr_content" required
<textarea name="wr_content" id="wr_content" required
<? if ($comment_min || $comment_max) { ?>onkeyup="check_byte('wr_content', 'char_count');"<?}?> title="댓글내용입력(필수)"><? echo $c_wr_content; ?></textarea>
<? if ($comment_min || $comment_max) { ?><script> check_byte('wr_content', 'char_count'); </script><?}?>
</td>

24
skin/board/gallery/write.skin.php
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" style="width:<?=$width;?>">
<form name="fwrite" id="fwrite" action="<?=$action_url?>" onsubmit="return fwrite_submit(this);" method="post" 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?>">
@ -53,28 +53,28 @@ echo $option_hidden;
<? if ($is_name) { ?>
<tr>
<th scope="row"><label for="wr_name">이름<strong class="sound_only">필수</strong></label></th>
<td><input type="text" id="wr_name" name="wr_name" class="frm_input required" size="10" maxlength="20" required value="<?=$name?>"></td>
<td><input type="text" name="wr_name" value="<?=$name?>"id="wr_name" required class="frm_input required" size="10" maxlength="20"></td>
</tr>
<? } ?>
<? if ($is_password) { ?>
<tr>
<th scope="row"><label for="wr_password">패스워드<strong class="sound_only">필수</strong></label></th>
<td><input type="password" id="wr_password" name="wr_password" class="frm_input" maxlength="20" <?=$password_required?>></td>
<td><input type="password" name="wr_password" id="wr_password" class="frm_input" maxlength="20" <?=$password_required?>></td>
</tr>
<? } ?>
<? if ($is_email) { ?>
<tr>
<th scope="row"><label for="wr_email">이메일</label></th>
<td><input type="text" id="wr_email" name="wr_email" class="frm_input email" size="50" value="<?=$email?>" maxlength="100"></td>
<td><input type="text" name="wr_email" value="<?=$email?>" id="wr_email" class="frm_input email" size="50" maxlength="100"></td>
</tr>
<? } ?>
<? if ($is_homepage) { ?>
<tr>
<th scope="row"><label for="wr_homepage">홈페이지</label></th>
<td><input type="text" id="wr_homepage" name="wr_homepage" class="frm_input" size="50" value="<?=$homepage?>"></td>
<td><input type="text" name="wr_homepage" value="<?=$homepage?>" id="wr_homepage" class="frm_input" size="50"></td>
</tr>
<? } ?>
@ -89,7 +89,7 @@ echo $option_hidden;
<tr>
<th scope="row"><label for="ca_name">분류<strong class="sound_only">필수</strong></label></th>
<td>
<select id="ca_name" name="ca_name" class="required" required>
<select name="ca_name" id="ca_name" required class="required">
<option value="">선택하세요</option>
<?=$category_option?>
</select>
@ -99,7 +99,7 @@ echo $option_hidden;
<tr>
<th scope="row"><label for="wr_subject">제목<strong class="sound_only">필수</strong></label></th>
<td><input type="text" id="wr_subject" name="wr_subject" class="frm_input required" size="50" required value="<?=$subject?>"></td>
<td><input type="text" name="wr_subject" value="<?=$subject?>" id="wr_subject" required class="frm_input required" size="50"></td>
</tr>
<tr>
@ -110,7 +110,7 @@ echo $option_hidden;
<? 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="50" value="<?if($w=="u"){echo$write['wr_link'.$i];}?>"></td>
<td><input type="text" name="wr_link<?=$i?>" value="<?if($w=="u"){echo$write['wr_link'.$i];}?>" id="wr_link<?=$i?>" class="frm_input" size="50"></td>
</tr>
<? } ?>
@ -118,12 +118,12 @@ echo $option_hidden;
<tr>
<th scope="row">파일 #<?=$i+1?></th>
<td>
<input type="file" name="bf_file[]" class="frm_file frm_input" title="파일첨부 <?=$i+1?> : 용량 <?=$upload_max_filesize?> 이하만 업로드 가능">
<input type="file" name="bf_file[]" title="파일첨부 <?=$i+1?> : 용량 <?=$upload_max_filesize?> 이하만 업로드 가능" class="frm_file frm_input">
<? if ($is_file_content) { ?>
<input type="text" name="bf_content[]" class="frm_file frm_input" value="<? echo $file[$i]['bf_content']; ?>" size="50" title="파일 설명을 입력해주세요.">
<input type="text" name="bf_content[]" value="<? echo $file[$i]['bf_content']; ?>" title="파일 설명을 입력해주세요." class="frm_file frm_input" size="50">
<?}?>
<? if($w == 'u' && $file[$i]['file']) { ?>
<input type="checkbox" id="bf_file_del<?=$i?>" name="bf_file_del[<? echo $i; ?>]" value="1"> <label for="bf_file_del<?=$i?>"><? echo $file[$i]['source'].'('.$file[$i]['size'].')'; ?> 파일 삭제</label>
<input type="checkbox" name="bf_file_del[<? echo $i; ?>]" value="1" id="bf_file_del<?=$i?>"> <label for="bf_file_del<?=$i?>"><? echo $file[$i]['source'].'('.$file[$i]['size'].')'; ?> 파일 삭제</label>
<? } ?>
</td>
</tr>
@ -142,7 +142,7 @@ echo $option_hidden;
</table>
<div class="btn_confirm">
<input type="submit" id="btn_submit" class="btn_submit" value="글쓰기" accesskey="s">
<input type="submit" value="글쓰기" id="btn_submit" accesskey="s" class="btn_submit">
<a href="./board.php?bo_table=<?=$bo_table?>" class="btn_cancel">취소</a>
</div>
</form>