firstgarden/firstgarden-web-gnu
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Activity

merge 충돌 처리

Browse Source
This commit is contained in:
whitedot
2013-06-13 11:31:56 +09:00
parent c0d2b4ca7d
commit 80c20cc73f
36 changed files with 399 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
skin/poll/shop_basic/poll_result.skin.php
View File

@ -3,24 +3,24 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
?>
<div id="poll_result" class="new_win">
<h1><?=$g4['title']?></h1>
<h1><?php echo $g4['title']; ?></h1>
<section id="poll_result_list">
<h2><?=$po_subject?> 결과</h2>
<h2><?php echo $po_subject; ?> 결과</h2>
<dl>
<dt><span>전체 <?=$nf_total_po_cnt?>표</span></dt>
<dt><span>전체 <?php echo $nf_total_po_cnt; ?>표</span></dt>
<dd>
<ol>
<? for ($i=1; $i<=count($list); $i++) { ?>
<li>
<p>
<?=$list[$i]['content']?>
<strong><?=$list[$i]['cnt']?> 표</strong>
<span><?=number_format($list[$i]['rate'], 1)?> 퍼센트</span>
<?php echo $list[$i]['content']; ?>
<strong><?php echo $list[$i]['cnt']; ?> 표</strong>
<span><?php echo number_format($list[$i]['rate'], 1); ?> 퍼센트</span>
</p>
<div class="poll_result_graph">
<span style="width:<?=number_format($list[$i]['rate'], 1)?>%"></span>
<span style="width:<?php echo number_format($list[$i]['rate'], 1); ?>%"></span>
</div>
</li>
<? } ?>
@ -36,12 +36,12 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<? for ($i=0; $i<count($list2); $i++) { ?>
<article>
<header>
<h1><?=$list2[$i]['pc_name']?><span class="sound_only">님의 의견</span></h1>
<?=$list2[$i]['name']?>
<span class="poll_datetime"><?=$list2[$i]['datetime']?></span>
<h1><?php echo $list2[$i]['pc_name']; ?><span class="sound_only">님의 의견</span></h1>
<?php echo $list2[$i]['name']; ?>
<span class="poll_datetime"><?php echo $list2[$i]['datetime']; ?></span>
</header>
<p>
<?=$list2[$i]['idea']?>
<?php echo $list2[$i]['idea']; ?>
</p>
<footer>
<span class="poll_cmt_del"><? if ($list2[$i]['del']) { echo $list2[$i]['del']."삭제</a>"; } ?></span>
@ -51,11 +51,11 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<? if ($member['mb_level'] >= $po['po_level']) { ?>
<form name="fpollresult" action="./poll_etc_update.php" onsubmit="return fpollresult_submit(this);" method="post" autocomplete="off">
<input type="hidden" name="po_id" value="<?=$po_id?>">
<input type="hidden" name="po_id" value="<?php echo $po_id; ?>">
<input type="hidden" name="w" value="">
<input type="hidden" name="skin_dir" value="<?=$skin_dir?>">
<? if ($is_member) { ?><input type="hidden" name="pc_name" value="<?=cut_str($member['mb_nick'],255)?>"><? } ?>
<h3><?=$po_etc?></h3>
<input type="hidden" name="skin_dir" value="<?php echo $skin_dir; ?>">
<? if ($is_member) { ?><input type="hidden" name="pc_name" value="<?php echo cut_str($member['mb_nick'],255); ?>"><? } ?>
<h3><?php echo $po_etc; ?></h3>
<table id="poll_result_wcmt" class="frm_tbl">
<tbody>
<? if ($is_guest) { ?>
@ -71,7 +71,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<? if ($is_guest) { ?>
<tr>
<th scope="row">자동등록방지</th>
<td><?=captcha_html();?></td>
<td><?php echo captcha_html(); ?></td>
</tr>
<? } ?>
</tbody>
@ -90,7 +90,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
<h2>다른 투표 결과 보기</h2>
<ul>
<? for ($i=0; $i<count($list3); $i++) { ?>
<li><a href="./poll_result.php?po_id=<?=$list3[$i]['po_id']?>&amp;skin_dir=<?=$skin_dir?>">[<?=$list3[$i]['date']?>] <?=$list3[$i]['subject']?></a></li>
<li><a href="./poll_result.php?po_id=<?php echo $list3[$i]['po_id']; ?>&amp;skin_dir=<?php echo $skin_dir; ?>">[<?php echo $list3[$i]['date']; ?>] <?php echo $list3[$i]['subject']; ?></a></li>
<? } ?>
</ul>
</section>