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

10
skin/member/shop_basic/login.skin.php
View File

@ -49,7 +49,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
</p>
<div id="guest_privacy">
<?=$default[de_guest_privacy]?>
<?php echo $default['de_guest_privacy']; ?>
</div>
<label for="agree">개인정보수집에 대한 내용을 읽었으며 이에 동의합니다.</label>
@ -69,10 +69,8 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
}
}
//f.url.value = "<?=$g4[shop_path]?>/orderform.php";
//f.action = "<?=$g4[shop_path]?>/orderform.php";
f.url.value = "<?=$url?>";
f.action = "<?=$url?>";
f.url.value = "<?php echo $url; ?>";
f.action = "<?php echo $url; ?>";
f.submit();
}
</script>
@ -83,7 +81,7 @@ if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
<fieldset id="mb_login_od">
<legend>비회원 주문조회</legend>
<form name="forderinquiry" method="post" action="<?=urldecode($url)?>" autocomplete="off">
<form name="forderinquiry" method="post" action="<?php echo urldecode($url); ?>" autocomplete="off">
<label for="od_id" class="od_id">주문서번호<strong class="sound_only"> 필수</strong></label>
<input type="text" name="od_id" value="<? echo $od_id ?>" id="od_id" required class="frm_input required" size="20">

10
skin/outlogin/shop_basic/outlogin.skin.1.php
View File

@ -2,22 +2,22 @@
if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
?>
<link rel="stylesheet" href="<?=$outlogin_skin_url?>/style.css">
<link rel="stylesheet" href="<?php echo $outlogin_skin_url; ?>/style.css">
<section id="ol_before" class="ol">
<h2>회원로그인</h2>
<!-- 로그인 전 외부로그인 시작 -->
<form name="foutlogin" action="<?=$outlogin_action_url?>" onsubmit="return fhead_submit(this);" method="post" autocomplete="off">
<form name="foutlogin" action="<?php echo $outlogin_action_url; ?>" onsubmit="return fhead_submit(this);" method="post" autocomplete="off">
<fieldset>
<input type="hidden" name="url" value="<?=$outlogin_url?>">
<input type="hidden" name="url" value="<?php echo $outlogin_url; ?>">
<label for="ol_id" id="ol_idlabel">회원아이디<strong class="sound_only">필수</strong></label>
<input type="text" id="ol_id" name="mb_id" required class="required" maxlength="20">
<label for="ol_pw" id="ol_pwlabel">패스워드<strong class="sound_only">필수</strong></label>
<input type="password" name="mb_password" id="ol_pw" required class="required" maxlength="20">
<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="<?php echo G4_BBS_URL; ?>/register.php"><b>회원가입</b></a>
<a href="<?php echo G4_BBS_URL; ?>/password_lost.php" id="ol_password_lost">정보찾기</a>
</div>
<div id="ol_auto">
<input type="checkbox" name="auto_login" value="1" id="auto_login">

20
skin/outlogin/shop_basic/outlogin.skin.2.php
View File

@ -2,26 +2,26 @@
if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
?>
<link rel="stylesheet" href="<?=$outlogin_skin_url?>/style.css">
<link rel="stylesheet" href="<?php echo $outlogin_skin_url; ?>/style.css">
<!-- 로그인 후 외부로그인 시작 -->
<section id="ol_after" class="ol">
<header id="ol_after_hd">
<h2>나의 회원정보</h2>
<strong><?=$nick?>님</strong>
<? if ($is_admin == 'super' || $is_auth) { ?><a href="<?=G4_ADMIN_URL?>/shop_admin" class="btn_admin">관리자 모드</a><? } ?>
<strong><?php echo $nick; ?>님</strong>
<? if ($is_admin == 'super' || $is_auth) { ?><a href="<?php echo G4_ADMIN_URL; ?>/shop_admin" class="btn_admin">관리자 모드</a><? } ?>
</header>
<ul id="ol_after_private">
<li>
<a href="<?=G4_BBS_URL?>/memo.php" target="_blank" id="ol_after_memo" class="win_memo">
<a href="<?php echo G4_BBS_URL; ?>/memo.php" target="_blank" id="ol_after_memo" class="win_memo">
<span class="sound_only">안 읽은 </span>쪽지
<strong><?=$memo_not_read?></strong>
<strong><?php echo $memo_not_read; ?></strong>
</a>
</li>
<li>
<a href="<?=G4_BBS_URL?>/point.php" target="_blank" id="ol_after_pt" class="win_point">
<a href="<?php echo G4_BBS_URL; ?>/point.php" target="_blank" id="ol_after_pt" class="win_point">
포인트
<strong><?=$point?></strong>
<strong><?php echo $point; ?></strong>
</a>
</li>
<li>
@ -29,8 +29,8 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
</li>
</ul>
<footer id="ol_after_ft">
<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>
<a href="<?php echo G4_BBS_URL; ?>/member_confirm.php?url=register_form.php" id="ol_after_info">정보수정</a>
<a href="<?php echo G4_BBS_URL; ?>/logout.php" id="ol_after_logout">로그아웃</a>
</footer>
</section>
@ -39,7 +39,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
function member_leave()
{
if (confirm("정말 회원에서 탈퇴 하시겠습니까?"))
location.href = "<?=G4_BBS_URL?>/member_confirm.php?url=member_leave.php";
location.href = "<?php echo G4_BBS_URL; ?>/member_confirm.php?url=member_leave.php";
}
</script>
<!-- 로그인 후 외부로그인 끝 -->

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>