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 
Conflicts:
	skin/member/neo/memo_form.skin.php
This commit is contained in:
gnuboard
2013-01-15 19:03:40 +09:00
parent 7a574f5077 41f59fa9ae
commit d4f56663fe
23 changed files with 359 additions and 340 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -11,32 +11,7 @@ if ($is_nogood) $colspan++;
<? if (!$wr_id) {?><h1><?=$g4['title']?></h1><?}?>
<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="hidden" name="sop" value="and">
<!-- <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>
<div class="bo_link">
<div class="bo_fx">
<div id="bo_cate">
<? if ($is_category) { ?>
<form id="fcategory" name="fcategory" method="get">
@ -50,6 +25,27 @@ if ($is_nogood) $colspan++;
<?=$page?> 페이지
</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="hidden" name="sop" value="and">
<input type="submit" class="fieldset_submit" value="검색">
</form>
</fieldset>
<? if ($rss_href || $write_href) {?>
<ul class="btn_bo_user">
<? if ($rss_href) { ?><li><a href="<?=$rss_href?>" class="btn02">RSS</a></li><? } ?>
@ -60,7 +56,7 @@ if ($is_nogood) $colspan++;
</div>
<!-- 게시판 목록 시작 -->
<form id="fboardlist" name="fboardlist" method="post">
<form id="fboardlist" name="fboardlist" method="post" action="./board_list_update.php" onsubmit="return fboardlist_submit(this);">
<input type="hidden" name="bo_table" value="<?=$bo_table?>">
<input type="hidden" name="sfl" value="<?=$sfl?>">
<input type="hidden" name="stx" value="<?=$stx?>">
@ -106,10 +102,9 @@ for ($i=0; $i<count($list); $i++) {
<a href="<?=$list[$i]['ca_name_href']?>" class="bo_cate_link<? if ($wr_id == $list[$i]['wr_id']) echo " bo_current";?>"><?=$list[$i]['ca_name']?></a>
<? } ?>
<a href="<?=$list[$i]['href']?>"<? if ($wr_id == $list[$i]['wr_id']) echo " class=\"bo_current\"";?>><?=$list[$i]['subject']?>
<? if ($list[$i]['comment_cnt']) { ?><?=$list[$i]['comment_cnt'];?><? } ?>
<a href="<?=$list[$i]['href']?>"<? if ($wr_id == $list[$i]['wr_id']) echo " class=\"bo_current\"";?>>
<?=$list[$i]['subject']?>
<? if ($list[$i]['comment_cnt']) { ?><?=$list[$i]['comment_cnt'];?><? } ?>
</a>
<?
@ -133,17 +128,16 @@ for ($i=0; $i<count($list); $i++) {
<? if (count($list) == 0) { echo '<tr><td colspan="'.$colspan.'" class="empty_table">게시물이 없습니다.</td></tr>'; } ?>
</tbody>
</table>
</form>
<div class="bo_link">
<div class="bo_fx">
<ul class="btn_bo_adm">
<? if ($list_href) { ?>
<li><a href="<?=$list_href?>" class="btn02">목록</a></li>
<? } ?>
<? if ($is_checkbox) { ?>
<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>
<li><input type="submit" name="btn_submit" class="btn02" onclick="document.pressed=this.value" value="선택삭제"></li>
<li><input type="submit" name="btn_submit" class="btn02" onclick="document.pressed=this.value" value="선택복사"></li>
<li><input type="submit" name="btn_submit" class="btn02" onclick="document.pressed=this.value" value="선택이동"></li>
<? } ?>
</ul>
@ -151,6 +145,11 @@ for ($i=0; $i<count($list); $i++) {
<li><? if ($write_href) { ?><a href="<?=$write_href?>" class="btn01">글쓰기</a><? } ?></li>
</ul>
</div>
</form>
<noscript>
<p>자바스크립트를 사용하지 않는 경우<br>별도의 확인 절차 없이 바로 선택삭제 처리하므로 주의하시기 바랍니다.</p>
</noscript>
<!-- 페이지 -->
<div class="pg">
@ -175,8 +174,7 @@ function all_checked(sw) {
}
}
function check_confirm(str) {
var f = document.fboardlist;
function fboardlist_submit(f) {
var chk_count = 0;
for (var i=0; i<f.length; i++) {
@ -185,27 +183,28 @@ function check_confirm(str) {
}
if (!chk_count) {
alert(str + "할 게시물을 하나 이상 선택하세요.");
alert(document.pressed + "할 게시물을 하나 이상 선택하세요.");
return false;
}
if(document.pressed == "선택복사") {
select_copy("copy");
return;
}
if(document.pressed == "선택이동") {
select_copy("move");
return;
}
if(document.pressed == "선택삭제") {
if (!confirm("선택한 게시물을 정말 삭제하시겠습니까?\n\n한번 삭제한 자료는 복구할 수 없습니다"))
return false;
}
return true;
}
// 선택한 게시물 삭제
function select_delete() {
var f = document.fboardlist;
str = "삭제";
if (!check_confirm(str))
return;
if (!confirm("선택한 게시물을 정말 "+str+" 하시겠습니까?\n\n한번 "+str+"한 자료는 복구할 수 없습니다"))
return;
f.action = "./delete_all.php";
f.submit();
}
// 선택한 게시물 복사 및 이동
function select_copy(sw) {
var f = document.fboardlist;
@ -215,9 +214,6 @@ function select_copy(sw) {
else
str = "이동";
if (!check_confirm(str))
return;
var sub_win = window.open("", "move", "left=50, top=50, width=500, height=550, scrollbars=1");
f.sw.value = sw;

17
skin/board/neo/write.skin.php
View File

@ -118,7 +118,7 @@ echo $option_hidden;
<tr>
<th scope="row">파일 #<?=$i?></th>
<td>
<input type="file" name="bf_file[]" class="frm_input frm_file" title="파일 용량 <?=$upload_max_filesize?> 이하만 업로드 가능">
<input type="file" name="bf_file[]" class="frm_input" title="파일 용량 <?=$upload_max_filesize?> 이하만 업로드 가능">
<? if ($is_file_content) { ?>
<input type="text" name="bf_content[]" class="frm_input" size="50" title="파일 설명을 입력해주세요.">
<?}?>
@ -126,14 +126,21 @@ echo $option_hidden;
</tr>
<?}?>
<? if ($is_guest) { //자동등록방지 ?>
<tr>
<th scope="row">자동등록방지</th>
<td>
<?=$captcha_html?>
</td>
</tr>
<? } ?>
</tbody>
</table>
<?=$captcha_html?>
<div class="btn_confirm">
<input type="submit" id="btn_submit" value="글쓰기" accesskey="s">
<a href="./board.php?bo_table=<?=$bo_table?>" title="글쓰기를 취소하고 목록으로 돌아가기">목록</a>
<input type="submit" id="btn_submit" class="btn_submit" value="글쓰기" accesskey="s">
<a href="./board.php?bo_table=<?=$bo_table?>" class="btn_cancel" title="글쓰기를 취소하고 목록으로 돌아가기">목록</a>
</div>
</form>

15
skin/member/neo/formmail.skin.php
View File

@ -50,18 +50,15 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<th scope="row"><label for="file2">첨부 2</label></th>
<td><input type="file" id="file2" name="file2" class="frm_input"></td>
</tr>
<tr>
<th scope="row">자동등록방지</th>
<td><?=captcha_html();?></td>
</tr>
</tbody>
</table>
<fieldset>
<legend>자동등록방지</legend>
<img id="kcaptcha_image" />
<input type="text" name="wr_key" class="fieldset_input required" title="자동등록방지" size="10" required>
왼쪽의 글자를 입력하세요.
</fieldset>
<div class="btn_confirm">
<input type="submit" id="btn_submit" value="메일발송">
<div class="btn_win">
<input type="submit" id="btn_submit" class="btn_submit" value="메일발송">
<a href="javascript:window.close();">창닫기</a>
</div>

2
skin/member/neo/memo.skin.php
View File

@ -37,7 +37,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
</tbody>
</table>
<div class="btn_window">
<div class="btn_win">
<a href="javascript:window.close();">창닫기</a>
</div>
</div>

11
skin/member/neo/memo_form.skin.php
View File

@ -2,7 +2,6 @@
if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
?>
<div id="memo_write" class="new_win">
<h1>쪽지보내기</h1>
@ -27,12 +26,22 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<th scope="row"><label for="me_memo">내용</label></th>
<td><textarea id="me_memo" name="me_memo" required><?=$content?></textarea></td>
</tr>
<tr>
<th scope="row">자동등록방지</th>
<td>
<?=captcha_html();?>
</td>
</tr>
</tbody>
</table>
<<<<<<< HEAD
<?=captcha_html();?>
<div class="btn_window btn_confirm">
=======
<div class="btn_win">
>>>>>>> 41f59fa9ae589fc22660fde7d19293f195aede31
<input type="submit" id="btn_submit" class="btn_submit" value="보내기">
<a href="javascript:window.close();">창닫기</a>
</div>

2
skin/member/neo/memo_view.skin.php
View File

@ -24,7 +24,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<?=conv_content($memo[me_memo], 0)?>
</p>
</section>
<div class="btn_window">
<div class="btn_win">
<a href="<?=$prev_link?>">이전쪽지</a>
<a href="<?=$next_link?>">다음쪽지</a>
<? if ($kind == 'recv') { ?><a href="./memo_form.php?me_recv_mb_id=<?=$mb[mb_id]?>&amp;me_id=<?=$memo[me_id]?>">답장</a><? } ?>

31
skin/member/neo/password_lost.skin.php
View File

@ -2,21 +2,26 @@
if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
?>
<h1>아이디/패스워드 찾기</h1>
<div id="find_info" class="new_win">
<h1>아이디/패스워드 찾기</h1>
<form name="fpasswordlost" method="post" action="<?=$action_url?>" onsubmit="return fpasswordlost_submit(this);" autocomplete="off">
<fieldset>
<legend>이메일 주소 입력</legend>
<p>회원가입 시 등록하신 이메일 주소를 입력해 주시면, 해당 이메일로 아이디와 패스워드 정보를 보내드립니다.</p>
<label for="mb_email">E-mail 주소</label>
<input type="text" id="mb_email" name="mb_email" class="email" required size="45" title="E-mail 주소">
</fieldset>
<? echo captcha_html(); ?>
<div class="btn_confirm">
<input type="submit" value="확인">
<a href="javascript:window.close();">창닫기</a>
<form name="fpasswordlost" method="post" action="<?=$action_url?>" onsubmit="return fpasswordlost_submit(this);" autocomplete="off">
<fieldset>
<legend>이메일 주소 입력</legend>
<p>
회원가입 시 등록하신 이메일 주소를 입력해 주세요.<br>
해당 이메일로 아이디와 패스워드 정보를 보내드립니다.
</p>
<label for="mb_email">E-mail 주소</label>
<input type="text" id="mb_email" name="mb_email" class="fieldset_input email" required size="30" title="E-mail 주소">
</fieldset>
<?=captcha_html(); ?>
<div class="btn_win">
<input type="submit" class="btn_submit" value="확인">
<a href="javascript:window.close();" class="btn_cancel">창닫기</a>
</div>
</form>
</div>
</form>
<script>
function fpasswordlost_submit(f)

2
skin/member/neo/profile.skin.php
View File

@ -37,7 +37,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<p><?=$mb_profile?></p>
</section>
<div class="btn_window">
<div class="btn_win">
<a href="javascript:window.close();">창닫기</a>
</div>
</div>

7
skin/member/neo/register_form.skin.php
View File

@ -193,9 +193,12 @@ var member_skin_path = "<?=$member_skin_path?>";
<td><input type="text" id="reg_mb_recommend" name="mb_recommend" class="frm_input" title="추천인아이디"></td>
</tr>
<? } ?>
</table>
<?=$captcha_html?>
<tr>
<th scope="row">자동등록방지</th>
<td><?=$captcha_html?></td>
</tr>
</table>
<div class="btn_confirm">
<input type="submit" class="btn_submit" value="회원가입" accesskey="s">

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

@ -35,7 +35,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<?=get_paging($config[cf_write_pages], $page, $total_page, "?$qstr&amp;page=");?>
</div>
<div class="btn_window">
<div class="btn_win">
<a href="javascript:window.close();">창닫기</a>
</div>
</div>

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

@ -29,7 +29,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
스크랩을 하시면서 감사 혹은 격려의 댓글을 남기실 수 있습니다.
</p>
<div class="btn_window">
<div class="btn_win">
<input type="submit" value="스크랩">
</div>
</div>

2
skin/member/neo/zip.skin.php
View File

@ -40,7 +40,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<p>검색결과가 끝났습니다.</p>
<div class="btn_window">
<div class="btn_win">
<a href="javascript:window.close();">창닫기</a>
</div>

4
skin/poll/neo/poll_result.skin.php
View File

@ -85,7 +85,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
</ul>
</section>
<div class="btn_window">
<a href="javascript:window.close();">창닫기</a>
<div class="btn_win">
<a href="javascript:window.close();" class="btn_cancel">창닫기</a>
</div>
</div>