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-01-28 11:40:52 +09:00
parent 422887316e f611d74d62
commit 86a6cbeb58
643 changed files with 1086 additions and 7931 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -61,8 +61,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<? } ?>
<?
$temp_view_link = array_filter($view['link']);
if (!empty($temp_view_link)) {
if (!empty($view['link'])) {
?>
<section id="bo_v_link">
<h2>관련링크</h2>
@ -70,7 +69,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<?
// 링크
$cnt = 0;
for ($i=1; $i<=$g4['link_count']; $i++) {
for ($i=1; $i<=count($view['link']); $i++) {
if ($view['link'][$i]) {
$cnt++;
$link = cut_str($view['link'][$i], 70);
@ -118,7 +117,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<?
// 파일 출력
for ($i=0; $i<=count($view['file']); $i++) {
if (isset($view['file'][$i]['view']) && $view['file'][$i]['view'])
if ($view['file'][$i]['view'])
echo $view['file'][$i]['view'];
}
?>

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

@ -104,10 +104,10 @@ echo $option_hidden;
<tr>
<th scope="row"><label for="wr_content">내용<strong class="sound_only">필수</strong></label></th>
<td><?=editor_html("wr_content", $content);?></td>
<td><?=editor_html("wr_content", $content, $is_dhtml_editor);?></td>
</tr>
<? for ($i=1; $is_link && $i<=$g4['link_count']; $i++) { ?>
<? 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>

4
skin/latest/neo/latest.skin.php
View File

@ -3,7 +3,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
?>
<div class="lt">
<strong class="lt_title"><a href="<?=$g4['bbs_path']?>/board.php?bo_table=<?=$bo_table?>"><?=$bo_subject?></a></strong>
<strong class="lt_title"><a href="<?=G4_BBS_URL?>/board.php?bo_table=<?=$bo_table?>"><?=$bo_subject?></a></strong>
<ul>
<? for ($i=0; $i<count($list); $i++) { ?>
<li>
@ -37,5 +37,5 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<? if (count($list) == 0) { //게시물이 없을 때 ?>
<p>게시물이 없습니다.</p>
<? } ?>
<div class="lt_more"><a href="<?=$g4['bbs_path']?>/board.php?bo_table=<?=$bo_table?>"><img src="<?=$latest_skin_path?>/img/icon_more.gif" alt="더보기"></a></div>
<div class="lt_more"><a href="<?=G4_BBS_URL?>/board.php?bo_table=<?=$bo_table?>"><img src="<?=$latest_skin_url?>/img/icon_more.gif" alt="더보기"></a></div>
</div>

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

@ -31,7 +31,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
</section>
<div class="btn_confirm">
<a href="<?=$g4['path']?>/">메인으로 돌아가기</a>
<a href="<?=$g4['url']?>/">메인으로 돌아가기</a>
</div>
</form>

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

@ -2,7 +2,7 @@
if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
?>
<script src="<?=$g4[path]?>/js/capslock.js"></script>
<script src="<?=$g4['url']?>/js/capslock.js"></script>
<div id="mb_confirm">

4
skin/outlogin/neo/outlogin.skin.1.php
View File

@ -14,8 +14,8 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<input type="password" id="ol_pw" name="mb_password" maxlength="20" required title="패스워드">
<input type="submit" id="ol_submit" value="로그인">
<div id="ol_svc">
<a href="<?=$g4['bbs_url']?>/register.php"><b>회원가입</b></a>
<a href="<?=$g4['bbs_url']?>/password_lost.php" id="ol_password_lost">정보찾기</a>
<a href="<?=G4_BBS_URL?>/register.php"><b>회원가입</b></a>
<a href="<?=G4_BBS_URL?>/password_lost.php" id="ol_password_lost">정보찾기</a>
<input type="checkbox" id="auto_login" name="auto_login" value="1">
<label for="auto_login" id="auto_login_label">자동로그인</label>
</div>

14
skin/outlogin/neo/outlogin.skin.2.php
View File

@ -7,28 +7,28 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<header id="ol_after_hd">
<h2>나의 이용정보</h2>
<strong><?=$nick?></strong>님
<? if ($is_admin == 'super' || $is_auth) { ?><a href="<?=$g4['admin_path']?>/" id="ol_admin">관리자</a><? } ?>
<? if ($is_admin == 'super' || $is_auth) { ?><a href="<?=G4_ADM_URL?>" id="ol_admin">관리자</a><? } ?>
</header>
<ul id="ol_after_private">
<li>
<a href="<?=$g4['path']?>/bbs/memo.php" id="ol_after_memo" target="_blank" onclick="win_memo(); return false;">
<a href="<?=G4_BBS_URL?>/memo.php" id="ol_after_memo" class="win_memo" target="_blank">
<span class="sound_only">안 읽은 </span>쪽지
<strong><?=$memo_not_read?></strong>
</a>
</li>
<li>
<a href="<?=$g4['path']?>/bbs/point.php" id="ol_after_pt" target="_blank" onclick="win_point(); return false;">
<a href="<?=G4_BBS_URL?>/point.php" id="ol_after_pt" class="win_point" target="_blank">
포인트
<strong><?=$point?></strong>
</a>
</li>
<li>
<a href="<?=$g4['path']?>/bbs/scrap.php" id="ol_after_scrap" target="_blank" onclick="win_scrap(); return false;">스크랩</a>
<a href="<?=G4_BBS_URL?>/scrap.php" id="ol_after_scrap" class="win_scrap" target="_blank">스크랩</a>
</li>
</ul>
<footer id="ol_after_ft">
<a href="<?=$g4['bbs_path']?>/member_confirm.php?url=register_form.php" id="ol_after_info">정보수정</a>
<a href="<?=$g4['bbs_path']?>/logout.php" id="ol_after_logout">로그아웃</a>
<a href="<?=G4_BBS_URL?>/member_confirm.php?url=register_form.php" id="ol_after_info">정보수정</a>
<a href="<?=G4_BBS_URL?>/logout.php" id="ol_after_logout">로그아웃</a>
</footer>
</section>
@ -37,7 +37,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
function member_leave()
{
if (confirm("정말 회원에서 탈퇴 하시겠습니까?"))
location.href = "<?=$g4['bbs_path']?>/member_confirm.php?url=member_leave.php";
location.href = "<?=G4_BBS_URL?>/member_confirm.php?url=member_leave.php";
}
</script>
<!-- 로그인 후 외부로그인 끝 -->

18
skin/poll/neo/poll.skin.php
View File

@ -13,13 +13,13 @@ if (!$po_id) {
$po = sql_fetch(" select * from {$g4['poll_table']} where po_id = '$po_id' ");
?>
<form name="fpoll" method="post" action="<?=$g4['bbs_url']?>/poll_update.php" onsubmit="return fpoll_submit(this);" target="winPoll">
<form name="fpoll" method="post" action="<?=G4_BBS_URL?>/poll_update.php" onsubmit="return fpoll_submit(this);" target="win_poll">
<input type="hidden" name="po_id" value="<?=$po_id?>">
<input type="hidden" name="skin_dir" value="<?=$skin_dir?>">
<section id="poll">
<header>
<h2>설문조사</h2>
<? if ($is_admin == "super") { ?><a href="<?=$g4['admin_url']?>/poll_form.php?w=u&amp;po_id=<?=$po_id?>">설문조사 관리</a><? } ?>
<? if ($is_admin == "super") { ?><a href="<?=G4_ADM_URL?>/poll_form.php?w=u&amp;po_id=<?=$po_id?>">설문조사 관리</a><? } ?>
<p><?=$po['po_subject']?></p>
</header>
<ul>
@ -29,7 +29,7 @@ $po = sql_fetch(" select * from {$g4['poll_table']} where po_id = '$po_id' ");
</ul>
<footer>
<input type="submit" class="btn_submit" value="투표하기">
<a href="<?="{$g4['bbs_path']}/poll_result.php?po_id=$po_id&amp;skin_dir=$skin_dir"?>" class="btn_cancel" target="_blank" onclick="poll_result(this.href); return false;">결과보기</a>
<a href="<?=G4_BBS_URL."/poll_result.php?po_id=$po_id&amp;skin_dir=$skin_dir"?>" class="btn_cancel" target="_blank" onclick="poll_result(this.href); return false;">결과보기</a>
</footer>
</section>
</form>
@ -37,6 +37,11 @@ $po = sql_fetch(" select * from {$g4['poll_table']} where po_id = '$po_id' ");
<script>
function fpoll_submit(f)
{
<?
if ($member['mb_level'] < $po['po_level'])
echo " alert('권한 {$po['po_level']} 이상의 회원만 투표에 참여하실 수 있습니다.'); return false; ";
?>
var chk = false;
for (i=0; i<f.gb_poll.length;i ++) {
if (f.gb_poll[i].checked == true) {
@ -45,13 +50,8 @@ function fpoll_submit(f)
}
}
<?
if ($member['mb_level'] < $po['po_level'])
echo " alert('권한 {$po['po_level']} 이상의 회원만 투표에 참여하실 수 있습니다.'); return false; ";
?>
if (!chk) {
alert("항목을 선택하세요");
alert("투표하실 설문항목을 선택하세요");
return false;
}