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

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

Browse Source
This commit is contained in:
chicpro
2013-10-14 08:55:10 +09:00
parent 95efcc2f2f 0dff444381
commit 4ff72df948
5 changed files with 327 additions and 310 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
adm/shop_admin/couponmember.php
View File

@ -44,6 +44,7 @@ $qstr1 = 'mb_name='.$_GET['mb_name'];
<input type="text" name="mb_name" id="mb_name" value="<?php echo $mb_name; ?>" class="frm_input required" required size="20"> <input type="text" name="mb_name" id="mb_name" value="<?php echo $mb_name; ?>" class="frm_input required" required size="20">
<input type="submit" value="검색" class="btn_frmline"> <input type="submit" value="검색" class="btn_frmline">
</div> </div>
<div class="tbl_head01 tbl_wrap">
<table> <table>
<caption>검색결과</caption> <caption>검색결과</caption>
<thead> <thead>
@ -70,6 +71,7 @@ $qstr1 = 'mb_name='.$_GET['mb_name'];
?> ?>
</tbody> </tbody>
</table> </table>
</div>
</form> </form>
<?php echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, '?'.$qstr1.'&amp;page='); ?> <?php echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, '?'.$qstr1.'&amp;page='); ?>

15
adm/shop_admin/coupontarget.php
View File

@ -56,9 +56,12 @@ $qstr1 = 'sch_target='.$_GET['sch_target'].'&amp;sch_word='.$_GET['sch_word'];
<div id="sch_target_frm" class="new_win scp_new_win"> <div id="sch_target_frm" class="new_win scp_new_win">
<h1>쿠폰 적용 <?php echo $html_title; ?>선택</h1> <h1>쿠폰 적용 <?php echo $html_title; ?>선택</h1>
<p class="new_win_desc"> <div class="local_desc01 local_desc">
쿠폰을 적용할 <?php echo $t_desc1; ?> 선택하세요. <?php echo $t_desc2; ?> 많을 경우에는 검색 기능을 이용하세요. <p>
쿠폰을 적용할 <?php echo $t_desc1; ?> 선택하세요.<br>
<?php echo $t_desc2; ?> 많을 경우에는 검색 기능을 이용하세요.
</p> </p>
</div>
<form name="ftarget" method="get"> <form name="ftarget" method="get">
<input type="hidden" name="sch_target" value="<?php echo $_GET['sch_target']; ?>"> <input type="hidden" name="sch_target" value="<?php echo $_GET['sch_target']; ?>">
@ -69,13 +72,14 @@ $qstr1 = 'sch_target='.$_GET['sch_target'].'&amp;sch_word='.$_GET['sch_word'];
<input type="submit" value="검색" class="btn_frmline"> <input type="submit" value="검색" class="btn_frmline">
</div> </div>
<div class="tbl_head01 tbl_wrap">
<table> <table>
<caption>검색결과</caption> <caption>검색결과</caption>
<thead> <thead>
<tr> <tr>
<th><?php echo $t_name; ?></th> <th scope="col"><?php echo $t_name; ?></th>
<th><?php echo $t_id; ?></th> <th scope="col"><?php echo $t_id; ?></th>
<th>선택</th> <th scope="col">선택</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
@ -95,6 +99,7 @@ $qstr1 = 'sch_target='.$_GET['sch_target'].'&amp;sch_word='.$_GET['sch_word'];
?> ?>
</tbody> </tbody>
</table> </table>
</div>
</form> </form>
<?php echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, '?'.$qstr1.'&amp;page='); ?> <?php echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, '?'.$qstr1.'&amp;page='); ?>

28
adm/shop_admin/itemform.php
View File

@ -595,7 +595,7 @@ $(function(){
</tr> </tr>
</tbody> </tbody>
</table> </table>
<div class="btn_confirm01 btn_confirm"> <div class="btn_confirm02 btn_confirm">
<button type="button" id="option_table_create" class="btn_frmline">옵션목록생성</button> <button type="button" id="option_table_create" class="btn_frmline">옵션목록생성</button>
</div> </div>
</div> </div>
@ -734,7 +734,7 @@ $(function(){
</tbody> </tbody>
</table> </table>
<div id="sit_option_addfrm_btn"><button type="button" id="add_supply_row" class="btn_frmline">옵션추가</button></div> <div id="sit_option_addfrm_btn"><button type="button" id="add_supply_row" class="btn_frmline">옵션추가</button></div>
<div class="btn_confirm01 btn_confirm"> <div class="btn_confirm02 btn_confirm">
<button type="button" id="supply_table_create">옵션목록생성</button> <button type="button" id="supply_table_create">옵션목록생성</button>
</div> </div>
</div> </div>
@ -1073,7 +1073,7 @@ $(function(){
<a href="./itemlist.php?<?php echo $qstr; ?>">목록</a> <a href="./itemlist.php?<?php echo $qstr; ?>">목록</a>
</div> </div>
<section id="anc_sitfrm_relation" class="cbox compare_wrap srel"> <section id="anc_sitfrm_relation" class="srel">
<h2 class="h2_frm">관련상품</h2> <h2 class="h2_frm">관련상품</h2>
<?php echo $pg_anchor; ?> <?php echo $pg_anchor; ?>
@ -1085,6 +1085,7 @@ $(function(){
</p> </p>
</div> </div>
<div class="compare_wrap">
<section class="compare_left"> <section class="compare_left">
<h3>등록된 전체상품 목록</h3> <h3>등록된 전체상품 목록</h3>
<label for="sch_relation" class="sound_only">상품분류</label> <label for="sch_relation" class="sound_only">상품분류</label>
@ -1213,12 +1214,15 @@ $(function(){
<input type="hidden" name="it_list" value="<?php echo $str; ?>"> <input type="hidden" name="it_list" value="<?php echo $str; ?>">
</section> </section>
</div>
</section> </section>
<section id="anc_sitfrm_event" class="cbox compare_wrap srel"> <section id="anc_sitfrm_event" class="srel">
<h2 class="h2_frm">관련이벤트</h2> <h2 class="h2_frm">관련이벤트</h2>
<?php echo $pg_anchor; ?> <?php echo $pg_anchor; ?>
<div class="compare_wrap">
<section class="compare_left"> <section class="compare_left">
<h3>등록된 전체이벤트 목록</h3> <h3>등록된 전체이벤트 목록</h3>
<div id="event_list" class="srel_list srel_noneimg"> <div id="event_list" class="srel_list srel_noneimg">
@ -1322,8 +1326,8 @@ $(function(){
?> ?>
</div> </div>
<input type="hidden" name="ev_list" value="<?php echo $str; ?>"> <input type="hidden" name="ev_list" value="<?php echo $str; ?>">
</section> </section>
</div>
</section> </section>
@ -1385,27 +1389,28 @@ $(function(){
</div> </div>
</section> </section>
<section id="anc_sitfrm_extra" class="cbox"> <section id="anc_sitfrm_extra">
<h2>여분필드 설정</h2> <h2>여분필드 설정</h2>
<?php echo $pg_anchor ?> <?php echo $pg_anchor ?>
<table class="frm_tbl"> <div class="tbl_frm01 tbl_wrap">
<table>
<colgroup> <colgroup>
<col class="grid_3"> <col class="grid_4">
<col class="grid_12"> <col>
<col class="grid_3"> <col class="grid_3">
</colgroup> </colgroup>
<tbody> <tbody>
<?php for ($i=1; $i<=10; $i++) { ?> <?php for ($i=1; $i<=10; $i++) { ?>
<tr> <tr>
<th scope="row">여분필드<?php echo $i ?></th> <th scope="row">여분필드<?php echo $i ?></th>
<td> <td class="td_extra">
<label for="it_<?php echo $i ?>_subj">여분필드 <?php echo $i ?> 제목</label> <label for="it_<?php echo $i ?>_subj">여분필드 <?php echo $i ?> 제목</label>
<input type="text" name="it_<?php echo $i ?>_subj" id="it_<?php echo $i ?>_subj" value="<?php echo get_text($it['it_'.$i.'_subj']) ?>" class="frm_input"> <input type="text" name="it_<?php echo $i ?>_subj" id="it_<?php echo $i ?>_subj" value="<?php echo get_text($it['it_'.$i.'_subj']) ?>" class="frm_input">
<label for="it_<?php echo $i ?>">여분필드 <?php echo $i ?> 값</label> <label for="it_<?php echo $i ?>">여분필드 <?php echo $i ?> 값</label>
<input type="text" name="it_<?php echo $i ?>" value="<?php echo get_text($it['it_'.$i]) ?>" id="it_<?php echo $i ?>" class="frm_input"> <input type="text" name="it_<?php echo $i ?>" value="<?php echo get_text($it['it_'.$i]) ?>" id="it_<?php echo $i ?>" class="frm_input">
</td> </td>
<td class="group_setting"> <td class="td_grpset">
<input type="checkbox" name="chk_grp_<?php echo $i ?>" value="1" id="chk_grp_<?php echo $i ?>"> <input type="checkbox" name="chk_grp_<?php echo $i ?>" value="1" id="chk_grp_<?php echo $i ?>">
<label for="chk_grp_<?php echo $i ?>">그룹적용</label> <label for="chk_grp_<?php echo $i ?>">그룹적용</label>
<input type="checkbox" name="chk_all_<?php echo $i ?>" value="1" id="chk_all_<?php echo $i ?>"> <input type="checkbox" name="chk_all_<?php echo $i ?>" value="1" id="chk_all_<?php echo $i ?>">
@ -1424,6 +1429,7 @@ $(function(){
<?php } ?> <?php } ?>
</tbody> </tbody>
</table> </table>
</div>
</section> </section>
<div class="btn_confirm01 btn_confirm"> <div class="btn_confirm01 btn_confirm">

1
adm/shop_admin/orderform.php
View File

@ -415,7 +415,6 @@ $pg_anchor = '<ul class="anchor">
<?php <?php
$sql = " select dl_company, dl_url, dl_tel from {$g5['g5_shop_delivery_table']} where dl_id = '{$od['dl_id']}' "; $sql = " select dl_company, dl_url, dl_tel from {$g5['g5_shop_delivery_table']} where dl_id = '{$od['dl_id']}' ";
$dl = sql_fetch($sql); $dl = sql_fetch($sql);
if ($od['od_settle_case'] == '계좌이체' || $od['od_settle_case'] == '가상계좌') {
?> ?>
<tr> <tr>
<th scope="row">배송회사</th> <th scope="row">배송회사</th>

17
css/admin.css
View File

@ -121,11 +121,16 @@ h2.h2_frm {padding-top:15px}
/* 버튼 */ /* 버튼 */
.btn_confirm {margin:0 20px 10px} .btn_confirm {margin:0 20px 10px}
.btn_confirm01 {clear:both;margin-bottom:20px;text-align:center} .btn_confirm01 {clear:both;text-align:center}
.btn_confirm01 button {padding:0 15px;height:30px;border:0;background:#617d46;color:#fff;line-height:2.2em;vertical-align:middle;cursor:pointer} .btn_confirm01 button {padding:0 15px;height:30px;border:0;background:#617d46;color:#fff;line-height:2.2em;vertical-align:middle;cursor:pointer}
.btn_confirm01 a {display:inline-block;padding:0 15px;height:30px;background:#617d46;color:#fff;text-decoration:none;line-height:2.5em;vertical-align:middle} .btn_confirm01 a {display:inline-block;padding:0 15px;height:30px;background:#617d46;color:#fff;text-decoration:none;line-height:2.5em;vertical-align:middle}
.btn_confirm01 a:focus {background:#555} .btn_confirm01 a:focus {background:#555}
.btn_confirm02 {clear:both;margin-top:10px;text-align:center}
.btn_confirm02 button {padding:0 15px;height:30px;border:0;background:#617d46;color:#fff;line-height:2.2em;vertical-align:middle;cursor:pointer}
.btn_confirm02 a {display:inline-block;padding:0 15px;height:30px;background:#617d46;color:#fff;text-decoration:none;line-height:2.5em;vertical-align:middle}
.btn_confirm02 a:focus {background:#555}
.btn_submit {background:#ff3061} .btn_submit {background:#ff3061}
.btn_confirm .btn_submit {padding:0 15px;border:0;height:30px;color:#fff} .btn_confirm .btn_submit {padding:0 15px;border:0;height:30px;color:#fff}
.btn_cancel {display:inline-block;padding:0 15px;height:30px;border:0;background:#617d46;color:#fff;text-decoration:none;line-height:2.5em;vertical-align:middle} .btn_cancel {display:inline-block;padding:0 15px;height:30px;border:0;background:#617d46;color:#fff;text-decoration:none;line-height:2.5em;vertical-align:middle}
@ -323,8 +328,8 @@ table .tr_bg1 {background:#f9f9f9}
.td_datetime {width:130px;text-align:center} .td_datetime {width:130px;text-align:center}
.td_delicom {width:100px} .td_delicom {width:100px}
.td_etc {width:80px;text-align:center} .td_etc {width:80px;text-align:center}
.td_extra label {display:inline-block;width:90px} .td_extra label {display:inline-block;width:100px}
.td_extra input {margin-right:5px;width:140px} .td_extra input {margin-right:5px;width:130px}
.td_grid {width:60px;text-align:center} .td_grid {width:60px;text-align:center}
td.td_grpset {width:160px;border-left:1px solid #e9ecee;text-align:center} td.td_grpset {width:160px;border-left:1px solid #e9ecee;text-align:center}
.td_id {width:150px} .td_id {width:150px}
@ -511,7 +516,7 @@ strong.sodr_nonpay {display:block;padding:5px 0;text-align:right}
#sit_option_frm fieldset .frm_input {margin:0 10px 0 5px;background:#fff !important;color:#000} #sit_option_frm fieldset .frm_input {margin:0 10px 0 5px;background:#fff !important;color:#000}
#sit_option_addfrm_btn {position:relative} #sit_option_addfrm_btn {position:relative}
#sit_option_addfrm_btn button {position:absolute;top:-38px;right:0} #sit_option_addfrm_btn button {position:absolute;top:-32px;right:0}
#sit_option_addfrm .btn_list {margin:0 0 10px} #sit_option_addfrm .btn_list {margin:0 0 10px}
#sit_option_addfrm fieldset {padding:10px;border:1px solid #e9e9e9;background:#f7f7f7;text-align:center} #sit_option_addfrm fieldset {padding:10px;border:1px solid #e9e9e9;background:#f7f7f7;text-align:center}
@ -543,7 +548,7 @@ strong.sodr_nonpay {display:block;padding:5px 0;text-align:right}
.srel section li {position:relative;border-bottom:1px solid #e9e9e9} .srel section li {position:relative;border-bottom:1px solid #e9e9e9}
.srel .srel_list {height:auto !important;height:200px;max-height:200px;border:1px solid #ced9de;background:#f6f6f6;overflow-y:scroll} .srel .srel_list {height:auto !important;height:200px;max-height:200px;border:1px solid #ced9de;background:#f6f6f6;overflow-y:scroll}
.srel .srel_sel {border:1px solid #ced9de;background:#fcfff2} .srel .srel_sel {border:1px solid #ced9de;background:#fcfff2}
.srel .srel_list p, .srel .srel_sel p {text-align:center} .srel .srel_list p, .srel .srel_sel p {padding:10px 0;text-align:center}
.srel .compare_left ul {margin:0;list-style:none} .srel .compare_left ul {margin:0;list-style:none}
.srel button {position:absolute;top:12px;right:0} .srel button {position:absolute;top:12px;right:0}
.srel .srel_noneimg li {padding:7px 0} .srel .srel_noneimg li {padding:7px 0}
@ -553,7 +558,7 @@ strong.sodr_nonpay {display:block;padding:5px 0;text-align:right}
/* 쿠폰관리 */ /* 쿠폰관리 */
.scp_new_win .empty_table {padding:30px 0} .scp_new_win .empty_table {padding:30px 0}
#scp_list_find {margin:10px auto 20px;padding:20px;width:86%;border:1px solid #e9e9e9;background:#fff} #scp_list_find {margin:10px 20px;padding:20px;border:1px solid #e9e9e9;background:#fff}
#scp_list_find .btn_frmline {line-height:1.5em !important} #scp_list_find .btn_frmline {line-height:1.5em !important}
#scp_list_find label {font-weight:bold} #scp_list_find label {font-weight:bold}