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/poll/neo/poll.skin.php
This commit is contained in:
gnuboard
2013-01-14 19:07:39 +09:00
parent 521c7b59ed 8acf7f8c21
commit 37361e4d29
7 changed files with 24 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@ -10,9 +10,9 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<? if ($is_admin == 'super' || $is_auth) { ?><a href="<?=$g4['admin_path']?>/" id="ol_admin">관리자</a><? } ?>
</header>
<ul id="ol_after_rec">
<li><a href="<?=$g4['path']?>/bbs/memo.php" id="ol_after_memo" target="_blank"><span id="ol_after_memo_img"></span>안 읽은 쪽지 <strong><?=$memo_not_read?></strong></a></li>
<li><a href="<?=$g4['path']?>/bbs/point.php" id="ol_after_pt" target="_blank"><span id="ol_after_pt_img"></span>포인트 <strong><?=$point?></strong></a></li>
<li><a href="<?=$g4['path']?>/bbs/scrap.php" id="ol_after_scrap" target="_blank"><span id="ol_after_scrap_img"></span><strong>스크랩</strong></a></li>
<li><a href="<?=$g4['path']?>/bbs/memo.php" id="ol_after_memo" target="_blank">안 읽은 쪽지 <span id="ol_after_memo_img"><?=$memo_not_read?></span></a></li>
<li><a href="<?=$g4['path']?>/bbs/point.php" id="ol_after_pt" target="_blank">포인트 <span id="ol_after_pt_img"><?=$point?></span></a></li>
<li><a href="<?=$g4['path']?>/bbs/scrap.php" id="ol_after_scrap" target="_blank"><span id="ol_after_scrap_img">스크랩</span></a></li>
</ul>
<footer id="ol_after_ft">
<ul>

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

@ -19,7 +19,11 @@ $po = sql_fetch(" select * from {$g4['poll_table']} where po_id = '$po_id' ");
<section id="poll">
<header>
<h2>설문조사</h2>
<<<<<<< HEAD
<? 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[admin_path]?>/poll_form.php?w=u&amp;po_id=<?=$po_id?>">설문관리</a><? } ?>
>>>>>>> 8acf7f8c214b606db9e4d7b3533a916ca4171b83
<p><?=$po['po_subject']?></p>
</header>
<ul>