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

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

Browse Source
This commit is contained in:
chicpro
2013-04-19 10:32:07 +09:00
parent 89b77264e5 688876e081
commit 6982441892
3 changed files with 67 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
adm/shop_admin/itemform.php
View File

@ -85,9 +85,9 @@ if (!$it['it_explan_html'])
$it['it_explan'] = get_text($it['it_explan'], 1);
}
//$qstr1 = "sel_ca_id=$sel_ca_id&sel_field=$sel_field&search=$search";
//$qstr = "$qstr1&sort1=$sort1&sort2=$sort2&page=$page";
$qstr = "$qstr&sca=$sca&page=$page";
//$qstr1 = 'sel_ca_id='.$sel_ca_id.'&sel_field='.$sel_field.'&search='.$search;
//$qstr = $qstr1.'&sort1='.$sort1.'&sort2='.$sort2.'&page='.$page;
$qstr = $qstr.'&sca='.$sca.'&page='.$page;
$g4['title'] = $html_title;
include_once (G4_ADMIN_PATH.'/admin.head.php');

26
adm/shop_admin/orderform.php
View File

@ -330,7 +330,7 @@ $pg_anchor = '<ul class="anchor">
<? if ($od['od_settle_case'] == '신용카드') { ?>
<tr>
<th scope="row" bgcolor=#F8FFED>신용카드 입금액</th>
<th scope="row" class="sodr_sppay">신용카드 입금액</th>
<td>
<? if ($od['od_card_time'] == "0000-00-00 00:00:00") {?>0원
<? } else { ?><?=display_amount($od['od_receipt_card'])?>
@ -338,7 +338,7 @@ $pg_anchor = '<ul class="anchor">
</td>
</tr>
<tr>
<th scope="row" bgcolor=#F8FFED>카드 승인일시</th>
<th scope="row" class="sodr_sppay">카드 승인일시</th>
<td>
<? if ($od['od_card_time'] == "0000-00-00 00:00:00") {?>신용카드 결제 일시 정보가 없습니다.
<? } else { ?><?=substr($od['od_card_time'], 0, 20)?>
@ -346,7 +346,7 @@ $pg_anchor = '<ul class="anchor">
</td>
</tr>
<tr>
<th scope="row" bgcolor=#F8FFED>카드 승인취소</th>
<th scope="row" class="sodr_sppay">카드 승인취소</th>
<td><?=display_amount($od['od_cancel_card'])?></td>
</tr>
<? } ?>
@ -518,15 +518,15 @@ $pg_anchor = '<ul class="anchor">
<? if ($od['od_settle_case'] == '신용카드') { ?>
<tr>
<th scope="row" bgcolor=#F8FFED><label for="od_receipt_card">신용카드 결제액</label></th>
<th scope="row" class="sodr_sppay"><label for="od_receipt_card">신용카드 결제액</label></th>
<td>
<input type="text" name="od_receipt_card" value="<?=$od['od_receipt_card'] ?>" id="od_receipt_card" size="10"> 원
<input type="text" name="od_receipt_card" value="<?=$od['od_receipt_card'] ?>" id="od_receipt_card" class="frm_input" size="10"> 원
<? $card_url = $g4['shop_cardpg'][$default['de_card_pg']]; ?>
<a href="<?=$card_url ?>" target="_blank">결제대행사</a>
</td>
</tr>
<tr>
<th scope="row" bgcolor=#F8FFED><label for="od_card_time">카드 승인일시</label></th>
<th scope="row" class="sodr_sppay"><label for="od_card_time">카드 승인일시</label></th>
<td>
<label for="od_card_chk">현재 시간으로 설정</label>
<input type="checkbox" name="od_card_chk" id="od_card_chk" value="<? echo date("Y-m-d H:i:s", G4_SERVER_TIME); ?>" onclick="if (this.checked == true) this.form.od_card_time.value=this.form.od_card_chk.value; else this.form.od_card_time.value = this.form.od_card_time.defaultValue;"><br>
@ -534,7 +534,7 @@ $pg_anchor = '<ul class="anchor">
</td>
</tr>
<tr>
<th scope="row" bgcolor=#F8FFED><label for="od_cancel_card">카드 승인취소</label></th>
<th scope="row" class="sodr_sppay"><label for="od_cancel_card">카드 승인취소</label></th>
<td><input type="text" name="od_cancel_card" value="<?=$od['od_cancel_card']?>" class="frm_input" size="10"> 원</td>
</tr>
<? } ?>
@ -660,15 +660,15 @@ $pg_anchor = '<ul class="anchor">
</colgroup>
<tbody>
<tr>
<th scope="row"><label for="od_name"><span class="sound_only">주문하시는 분 </span>이름</label></th>
<th scope="row"><label for="od_name"><span class="sound_only">주문하신 분 </span>이름</label></th>
<td><input type="text" name="od_name" value="<?=$od['od_name']?>" id="od_name" required class="frm_input required"></td>
</tr>
<tr>
<th scope="row"><label for="od_tel"><span class="sound_only">주문하시는 분 </span>전화번호</label></th>
<th scope="row"><label for="od_tel"><span class="sound_only">주문하신 분 </span>전화번호</label></th>
<td><input type="text" name="od_tel" value="<?=$od['od_tel']?>" id="od_tel" required class="frm_input required"></td>
</tr>
<tr>
<th scope="row"><label for="od_hp"><span class="sound_only">주문하시는 분 </span>핸드폰</label></th>
<th scope="row"><label for="od_hp"><span class="sound_only">주문하신 분 </span>핸드폰</label></th>
<td><input type="text" name="od_hp" value="<?=$od['od_hp']?>" id="od_hp" class="frm_input"></td>
</tr>
<tr>
@ -694,11 +694,11 @@ $pg_anchor = '<ul class="anchor">
</script>
</tr>
<tr>
<th scope="row"><label for="od_email"><span class="sound_only">주문하시는 분 </span>E-mail</label></th>
<th scope="row"><label for="od_email"><span class="sound_only">주문하신 분 </span>E-mail</label></th>
<td><input type="text" name="od_email" value="<?=$od['od_email']?>" id="od_email" required class="frm_input email required" size="30"></td>
</tr>
<tr>
<th scope="row"><span class="sound_only">주문하시는 분 </span>IP Address</th>
<th scope="row"><span class="sound_only">주문하신 분 </span>IP Address</th>
<td><?=$od[od_ip]?></td>
</tr>
</tbody>
@ -777,8 +777,8 @@ $pg_anchor = '<ul class="anchor">
</div>
<div class="btn_confirm">
<button type="button" accesskey="l" onclick="document.location.href='./orderlist.php?<?=$qstr?>';">목록</button>
<button type="button" onclick="del('./orderdelete.php?od_id=<?=$od['od_id']?>&amp;uq_id=<?=$od['uq_id']?>&amo;mb_id=<?=$od['mb_id']?>&amp;<?=$qstr?>');">주문서 삭제</button>
<a href="./orderlist.php?<?=$qstr?>">목록</a>
</div>
<script>

99
css/admin.css
View File

@ -308,6 +308,55 @@ td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9
#cache_del p span {color:#ff3061}
/* 새창 기본 스타일 */
.new_win {}
.new_win h1 {margin-bottom:20px;padding:0 20px;height:60px;border-top:2px solid #484848;border-bottom:1px solid #e9e9e9;background:#fff;font-size:1.2em;line-height:5em}
.new_win table {margin:0 auto 20px;width:93%;background:#fff}
.new_win_ul {margin:-20px 0 20px 0;padding:0 0 0 20px;border-bottom:1px solid #515151;background:#484848;list-style:none;zoom:1}
.new_win_ul:after {display:block;visibility:hidden;clear:both;content:""}
.new_win_ul li {float:left;margin-left:-1px}
.new_win_ul a {display:block;padding:10px 10px 8px;border-right:1px solid #595959;border-left:1px solid #595959;color:#fff;font-family:"dotum";font-weight:bold;text-decoration:none}
.new_win_desc {margin:0 auto;width:93%}
/* 자바스크립트 alert 대안 */
#validation_check {margin:100px auto;width:500px}
#validation_check h1 {margin-bottom:20px;font-size:1.3em}
#validation_check p {margin-bottom:20px;padding:30px 20px;border:1px solid #e9e9e9;background:#fff}
/* 관리자 패스워드 확인 */
#admin_confirm {padding:0 0 10px;background:#222;text-align:center}
#admin_confirm p {margin:0 0 10px;color:#9ab9c5;background:#383a3f}
#admin_confirm label {color:#fff}
#admin_confirm .frm_input {border-color:#000}
/* 사이드뷰 */
.sv_wrap {display:inline-block;position:relative;font-weight:normal;font-size:1em}
.sv_wrap .sv {z-index:1000;display:none;margin:5px 0 0;border:1px solid #283646;background:#111}
.sv_wrap .sv a {display:inline-block !important;margin:0 !important;padding:3px !important;width:94px;border-bottom:1px solid #283646;color:#fff !important}
.sv_wrap a:focus,
.sv_wrap a:hover,
.sv_wrap a:active {text-decoration:none !important}
.sv_on {display:block !important;position:absolute;top:10px;left:20px;width:auto;height:auto !important}
.sv_nojs .sv {display:block}
/* pagination */
.pg_wrap {clear:both;margin:0 0 20px;padding-top:20px;text-align:center}
.pg {display:inline-block;border:1px solid #ddd;letter-spacing:-4px}
.pg a:focus,
.pg a:hover,
.pg a:active {text-decoration:none}
.pg_page,
.pg_current {display:inline-block;padding:0 12px;height:30px;color:#000;letter-spacing:0;line-height:2.6em;vertical-align:middle}
.pg_page {background:#f9f9f9;text-decoration:none}
.pg_start,
.pg_prev {border-right:1px solid #ddd}
.pg_end,
.pg_next {border-left:1px solid #ddd}
.pg_current {background:#444;color:#fff;font-weight:bold}
/* ########## 쇼핑몰 사용시 적용 ########## */
/* 쇼핑몰 설정 */
#frm_payment textarea {height:50px}
@ -343,6 +392,7 @@ td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9
/* 주문내역 수정 */
.sodr_nonpay {color:#ff6600}
strong.sodr_nonpay {display:block;padding:5px 0;text-align:right}
.sodr_sppay {color:#1f9bff}
#frm_odr_memo textarea {width:98%}
#frm_odr_memo .btn_confirm {margin:10px 0 0}
#frm_odr_payer #od_addr1,
@ -427,51 +477,4 @@ strong.sodr_nonpay {display:block;padding:5px 0;text-align:right}
#frm_compare_engine dt a {font-weight:bold}
#frm_compare_engine dd {margin:0 0 30px}
#frm_compare_engine li {margin:5px 0}
/* 새창 기본 스타일 */
.new_win {}
.new_win h1 {margin-bottom:20px;padding:0 20px;height:60px;border-top:2px solid #484848;border-bottom:1px solid #e9e9e9;background:#fff;font-size:1.2em;line-height:5em}
.new_win table {margin:0 auto 20px;width:93%;background:#fff}
.new_win_ul {margin:-20px 0 20px 0;padding:0 0 0 20px;border-bottom:1px solid #515151;background:#484848;list-style:none;zoom:1}
.new_win_ul:after {display:block;visibility:hidden;clear:both;content:""}
.new_win_ul li {float:left;margin-left:-1px}
.new_win_ul a {display:block;padding:10px 10px 8px;border-right:1px solid #595959;border-left:1px solid #595959;color:#fff;font-family:"dotum";font-weight:bold;text-decoration:none}
.new_win_desc {margin:0 auto;width:93%}
/* 자바스크립트 alert 대안 */
#validation_check {margin:100px auto;width:500px}
#validation_check h1 {margin-bottom:20px;font-size:1.3em}
#validation_check p {margin-bottom:20px;padding:30px 20px;border:1px solid #e9e9e9;background:#fff}
/* 관리자 패스워드 확인 */
#admin_confirm {padding:0 0 10px;background:#222;text-align:center}
#admin_confirm p {margin:0 0 10px;color:#9ab9c5;background:#383a3f}
#admin_confirm label {color:#fff}
#admin_confirm .frm_input {border-color:#000}
/* 사이드뷰 */
.sv_wrap {display:inline-block;position:relative;font-weight:normal;font-size:1em}
.sv_wrap .sv {z-index:1000;display:none;margin:5px 0 0;border:1px solid #283646;background:#111}
.sv_wrap .sv a {display:inline-block !important;margin:0 !important;padding:3px !important;width:94px;border-bottom:1px solid #283646;color:#fff !important}
.sv_wrap a:focus,
.sv_wrap a:hover,
.sv_wrap a:active {text-decoration:none !important}
.sv_on {display:block !important;position:absolute;top:10px;left:20px;width:auto;height:auto !important}
.sv_nojs .sv {display:block}
/* pagination */
.pg_wrap {clear:both;margin:0 0 20px;padding-top:20px;text-align:center}
.pg {display:inline-block;border:1px solid #ddd;letter-spacing:-4px}
.pg a:focus,
.pg a:hover,
.pg a:active {text-decoration:none}
.pg_page,
.pg_current {display:inline-block;padding:0 12px;height:30px;color:#000;letter-spacing:0;line-height:2.6em;vertical-align:middle}
.pg_page {background:#f9f9f9;text-decoration:none}
.pg_start,
.pg_prev {border-right:1px solid #ddd}
.pg_end,
.pg_next {border-left:1px solid #ddd}
.pg_current {background:#444;color:#fff;font-weight:bold}
#frm_compare_engine li {margin:5px 0}