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:
	head.php
This commit is contained in:
gnuboard
2012-12-26 12:51:01 +09:00
parent e5c04a60b8 c6d75730d6
commit defca75c2c
4 changed files with 16 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
head.php
View File

@ -39,7 +39,11 @@ include_once($g4['path'].'/lib/popular.lib.php');
<input type="submit" value="검색"> <input type="submit" value="검색">
</fieldset> </fieldset>
</form> </form>
<<<<<<< HEAD
<? if (!isset($bo_table)) {?><h1><?=$g4['title']?></h1><? } ?> <? if (!isset($bo_table)) {?><h1><?=$g4['title']?></h1><? } ?>
=======
<h1><?=$config['cf_title']?></h1>
>>>>>>> c6d75730d63bbcb65a6e77baf559a24b33fb43c1
</header> </header>
<div> <div>
@ -48,3 +52,9 @@ include_once($g4['path'].'/lib/popular.lib.php');
</div> </div>
<div id="wrapper"> <div id="wrapper">
<p>
g4s 강좌 홈페이지에 오신 것을 환영합니다.
</p>
<p>
<a href="<?=$g4['path']?>/bbs/board.php?bo_table=1">테스트용 게시판</a>
</p>

7
index.php
View File

@ -6,13 +6,6 @@ $g4['title'] = '';
include_once('./_head.php'); include_once('./_head.php');
?> ?>
<p>
g4s 강좌 홈페이지에 오신 것을 환영합니다.
</p>
<p>
<a href="<?=$g4['path']?>/bbs/board.php?bo_table=1">테스트용 게시판</a>
</p>
<?=latest("neo",1,5)?> <?=latest("neo",1,5)?>
<?=latest("neo",1,5)?> <?=latest("neo",1,5)?>

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

@ -14,7 +14,8 @@ if (!$po_id)
$po = sql_fetch(" select * from $g4[poll_table] where po_id = '$po_id' "); $po = sql_fetch(" select * from $g4[poll_table] where po_id = '$po_id' ");
?> ?>
<div> <section>
<h2>사이트 설문조사</h2>
<form name="fpoll" method="post" action="<?=$g4[bbs_path]?>/poll_update.php" onsubmit="return fpoll_submit(this);" target="winPoll"> <form name="fpoll" method="post" action="<?=$g4[bbs_path]?>/poll_update.php" onsubmit="return fpoll_submit(this);" target="winPoll">
<input type="hidden" name="po_id" value="<?=$po_id?>"> <input type="hidden" name="po_id" value="<?=$po_id?>">
<input type="hidden" name="skin_dir" value="<?=$skin_dir?>"> <input type="hidden" name="skin_dir" value="<?=$skin_dir?>">
@ -28,7 +29,7 @@ $po = sql_fetch(" select * from $g4[poll_table] where po_id = '$po_id' ");
<input type="submit" value="투표하기"> <input type="submit" value="투표하기">
<a href="javascript:;" onclick="poll_result('<?=$po_id?>');">결과보기</a> <a href="javascript:;" onclick="poll_result('<?=$po_id?>');">결과보기</a>
</form> </form>
</div>
<script> <script>
function fpoll_submit(f) function fpoll_submit(f)
{ {

5
tail.php
View File

@ -4,12 +4,13 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
</div> </div>
<div> <footer>
<h1><?=$config['cf_title']?> 정보</h1>
<?=visit('neo'); // 방문자수 ?> <?=visit('neo'); // 방문자수 ?>
<?=connect(); // 현재 접속자수 ?> <?=connect(); // 현재 접속자수 ?>
<?=popular('neo'); // 인기검색어 ?> <?=popular('neo'); // 인기검색어 ?>
<p>Copyright &copy; 소유하신 도메인. All rights reserved.</p> <p>Copyright &copy; 소유하신 도메인. All rights reserved.</p>
</div> </footer>
<script> <script>
function fsearchbox_submit(f) function fsearchbox_submit(f)