Merge branch 'master' of github.com:gnuboard/yc5

This commit is contained in:
chicpro
2014-01-03 14:35:58 +09:00
3 changed files with 58 additions and 18 deletions

View File

@ -86,6 +86,11 @@ $pg_anchor ='<ul class="anchor">
<li><a href="#anc_scatefrm_extra">여분필드</a></li>';
if ($w == 'u') $pg_anchor .= '<li><a href="#frm_etc">기타설정</a></li>';
$pg_anchor .= '</ul>';
$frm_submit = '<div class="btn_confirm01 btn_confirm">
<input type="submit" value="확인" class="btn_submit" accesskey="s">
<a href="./categorylist.php?'.$qstr.'">목록</a>
</div>';
?>
<form name="fcategoryform" action="./categoryformupdate.php" onsubmit="return fcategoryformcheck(this);" method="post" enctype="multipart/form-data">
@ -252,6 +257,8 @@ $pg_anchor .= '</ul>';
</div>
</section>
<?php echo $frm_submit; ?>
<section id="anc_scatefrm_optional">
<h2 class="h2_frm">선택 입력</h2>
<?php echo $pg_anchor; ?>
@ -311,6 +318,8 @@ $pg_anchor .= '</ul>';
</div>
</section>
<?php echo $frm_submit; ?>
<section id="anc_scatefrm_extra">
<h2>여분필드 설정</h2>
<?php echo $pg_anchor ?>
@ -338,6 +347,8 @@ $pg_anchor .= '</ul>';
</div>
</section>
<?php echo $frm_submit; ?>
<?php if ($w == "u") { ?>
<section id="frm_etc">
<h2 class="h2_frm">기타설정</h2>
@ -363,12 +374,9 @@ $pg_anchor .= '</ul>';
</table>
</div>
</section>
<?php echo $frm_submit; ?>
<?php } ?>
<div class="btn_confirm01 btn_confirm">
<input type="submit" value="확인" class="btn_submit" accesskey="s">
<a href="./categorylist.php?<?php echo $qstr; ?>">목록</a>
</div>
</form>
<script>

View File

@ -33,6 +33,11 @@ $pg_anchor = '<ul class="anchor">
<li><a href="#anc_scf_sms">SMS설정</a></li>
</ul>';
$frm_submit = '<div class="btn_confirm01 btn_confirm">
<input type="submit" value="확인" class="btn_submit" accesskey="s">
<a href="'.G5_SHOP_URL.'">쇼핑몰</a>
</div>';
// index 선택 설정 필드추가
if(!isset($default['de_root_index_use'])) {
sql_query(" ALTER TABLE `{$g5['g5_shop_default_table']}`
@ -119,6 +124,8 @@ if(!isset($default['de_root_index_use'])) {
</div>
</section>
<?php echo $frm_submit; ?>
<section id="anc_scf_skin">
<h2 class="h2_frm">스킨설정</h2>
<?php echo $pg_anchor; ?>
@ -167,6 +174,8 @@ if(!isset($default['de_root_index_use'])) {
</div>
</section>
<?php echo $frm_submit; ?>
<section id="anc_scf_index">
<h2 class="h2_frm">쇼핑몰 초기화면</h2>
<?php echo $pg_anchor; ?>
@ -285,6 +294,8 @@ if(!isset($default['de_root_index_use'])) {
</div>
</section>
<?php echo $frm_submit; ?>
<section id="anc_mscf_index">
<h2 class="h2_frm">모바일 쇼핑몰 초기화면 설정</h2>
<?php echo $pg_anchor; ?>
@ -392,6 +403,7 @@ if(!isset($default['de_root_index_use'])) {
</div>
</section>
<?php echo $frm_submit; ?>
<section id ="anc_scf_payment">
<h2 class="h2_frm">결제정보</h2>
@ -553,8 +565,8 @@ if(!isset($default['de_root_index_use'])) {
<input type="radio" name="de_card_test" value="1" <?php echo $default['de_card_test']==1?"checked":""; ?> id="de_card_test2">
<label for="de_card_test2">테스트결제</label>
<div id="scf_cardtest">
<a href="https://admin8.kcp.co.kr/assist/login.LoginAction.do" target="_blank">실결제 관리자</a>
<a href="http://testadmin8.kcp.co.kr/assist/login.LoginAction.do" target="_blank">테스트 관리자</a>
<a href="https://admin8.kcp.co.kr/assist/login.LoginAction.do" target="_blank" class="btn_frmline">실결제 관리자</a>
<a href="http://testadmin8.kcp.co.kr/assist/login.LoginAction.do" target="_blank" class="btn_frmline">테스트 관리자</a>
</div>
<div id="scf_cardtest_tip">
<strong>일반결제 사용시 테스트 결제</strong>
@ -578,7 +590,7 @@ if(!isset($default['de_root_index_use'])) {
</div>
<script>
$('#scf_cardtest_tip').attr('class','scf_cardtest_tip');
$('<button type="button" id="scf_cardtest_btn">테스트결제 팁 더보기</button>').appendTo('#scf_cardtest');
$('<button type="button" id="scf_cardtest_btn" class="btn_frmline">테스트결제 팁 더보기</button>').appendTo('#scf_cardtest');
</script>
</td>
</tr>
@ -601,6 +613,8 @@ if(!isset($default['de_root_index_use'])) {
</div>
</section>
<?php echo $frm_submit; ?>
<section id="anc_scf_delivery">
<h2 >배송정보</h2>
<?php echo $pg_anchor; ?>
@ -684,6 +698,8 @@ if(!isset($default['de_root_index_use'])) {
</div>
</section>
<?php echo $frm_submit; ?>
<section id="anc_scf_etc">
<h2 class="h2_frm">기타 설정</h2>
<?php echo $pg_anchor; ?>
@ -919,6 +935,8 @@ if(!isset($default['de_root_index_use'])) {
</div>
</section>
<?php echo $frm_submit; ?>
<?php if (file_exists($logo_img) || file_exists($main_img)) { ?>
<script>
$(".banner_or_img").addClass("scf_img");
@ -1136,9 +1154,7 @@ function byte_check(el_cont, el_byte)
</section>
<div class="btn_confirm01 btn_confirm">
<input type="submit" value="확인" class="btn_submit" accesskey="s">
</div>
<?php echo $frm_submit; ?>
</form>

View File

@ -101,6 +101,12 @@ $pg_anchor ='<ul class="anchor">
<li><a href="#anc_sitfrm_extra">여분필드</a></li>
</ul>
';
$frm_submit = '<div class="btn_confirm01 btn_confirm">
<a href="'.G5_SHOP_URL.'/item.php?it_id='.$it_id.'" class="btn_frmline">상품확인</a>
<input type="submit" value="확인" class="btn_submit" accesskey="s">
<a href="./itemlist.php?'.$qstr.'">목록</a>
</div>';
?>
<form name="fitemform" action="./itemformupdate.php" method="post" enctype="MULTIPART/FORM-DATA" autocomplete="off" onsubmit="return fitemformcheck(this)">
@ -169,6 +175,8 @@ $pg_anchor ='<ul class="anchor">
</div>
</section>
<?php echo $frm_submit; ?>
<section id="anc_sitfrm_ini">
<h2 class="h2_frm">기본정보</h2>
<?php echo $pg_anchor; ?>
@ -365,6 +373,8 @@ $pg_anchor ='<ul class="anchor">
</div>
</section>
<?php echo $frm_submit; ?>
<section id="anc_sitfrm_compact">
<h2 class="h2_frm">상품요약정보</h2>
<?php echo $pg_anchor; ?>
@ -389,6 +399,8 @@ $pg_anchor ='<ul class="anchor">
<div id="sit_compact_fields"><?php include_once(G5_ADMIN_PATH.'/shop_admin/iteminfo.php'); ?></div>
</section>
<?php echo $frm_submit; ?>
<script>
$(function(){
$("#it_info_gubun").live("change", function() {
@ -925,6 +937,8 @@ $(function(){
</div>
</section>
<?php echo $frm_submit; ?>
<section id="anc_sitfrm_sendcost">
<h2 class="h2_frm">배송비</h2>
<?php echo $pg_anchor; ?>
@ -1066,6 +1080,8 @@ $(function(){
</script>
</section>
<?php echo $frm_submit; ?>
<section id="anc_sitfrm_img">
<h2 class="h2_frm">이미지</h2>
<?php echo $pg_anchor; ?>
@ -1108,10 +1124,7 @@ $(function(){
</div>
</section>
<div class="btn_confirm01 btn_confirm">
<input type="submit" value="확인" class="btn_submit" accesskey="s">
<a href="./itemlist.php?<?php echo $qstr; ?>">목록</a>
</div>
<?php echo $frm_submit; ?>
<section id="anc_sitfrm_relation" class="srel">
<h2 class="h2_frm">관련상품</h2>
@ -1258,6 +1271,8 @@ $(function(){
</section>
<?php echo $frm_submit; ?>
<section id="anc_sitfrm_event" class="srel">
<h2 class="h2_frm">관련이벤트</h2>
<?php echo $pg_anchor; ?>
@ -1371,6 +1386,8 @@ $(function(){
</section>
<?php echo $frm_submit; ?>
<section id="anc_sitfrm_optional">
<h2 class="h2_frm">상세설명설정</h2>
<?php echo $pg_anchor; ?>
@ -1429,6 +1446,8 @@ $(function(){
</div>
</section>
<?php echo $frm_submit; ?>
<section id="anc_sitfrm_extra">
<h2>여분필드 설정</h2>
<?php echo $pg_anchor ?>
@ -1479,10 +1498,7 @@ $(function(){
</div>
</section>
<div class="btn_confirm01 btn_confirm">
<input type="submit" value="확인" class="btn_submit" accesskey="s">
<a href="./itemlist.php?<?php echo $qstr; ?>">목록</a>
</div>
<?php echo $frm_submit; ?>
</form>