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-07-11 16:37:12 +09:00
parent f432f6dc91 2c66145245
commit 2f06d7c854
4 changed files with 29 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
css/default_shop.css
View File

@ -251,7 +251,6 @@ td.empty_table {padding:85px 0;text-align:center}
.frm_tbl th {padding-left:10px;width:100px;border-top:1px solid #eee;border-bottom:1px solid #eee;font-weight:normal;text-align:left}
.frm_tbl td {padding:7px 10px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;background:transparent}
.frm_tbl textarea, .frm_input {padding:2px 2px 3px;border:1px solid #b8c9c2;background:#f5f6fa;vertical-align:middle}
.frm_input:focus, input.required:focus {border:1px solid #b8c9c2;background:#21272e !important;color:#fff}
.frm_tbl textarea {width:90%;height:150px}
.frm_address {display:block;margin-top:5px}
.frm_file {display:block;margin-bottom:5px}
@ -700,8 +699,6 @@ td.empty_table {padding:85px 0;text-align:center}
#sod_frm_pay {position:relative}
#sod_frm_pay .basic_tbl th {width:auto !important;font-weight:bold;text-align:center !important}
#sod_frm_pay .basic_tbl td {padding:8px 5px 6px !important;border-top:1px solid #e9e9e9 !important;border-bottom:1px solid #e9e9e9 !important;line-height:1.5em !important;word-break:break-all !important}
#sod_frm_pay .frm_input {background:#fff !important}
#sod_frm_pay .frm_input:focus {color:#000}
#sod_frm_pay #sc_coupon_frm, #sod_frm_pay #od_coupon_frm {z-index:10000;position:absolute;top:0;left:99px;padding:20px;width:500px;height:auto !important;height:500px;max-height:500px;border:1px solid #000;background:#f5f6fa;overflow-y:scroll}
@ -732,6 +729,15 @@ td.empty_table {padding:85px 0;text-align:center}
#sod_ul p {padding:5px 14px}
#sod_ul p a {font-weight:bold;text-decoration:none}
#request_form {position:relative}
#request_form div {display:none;z-index:10000;position:absolute;top:-74px;left:0;padding:20px 0;width:350px;border:1px solid #000;background:#f5f6fa;text-align:center}
#request_form .frm_input {background:#fff !important}
#request_form .btn_frmline, #request_form .btn_cancel {vertical-align:middle !important}
#request_form .btn_frmline {padding:0 10px;line-height:1.6em}
#sod_req_btn {margin:0 0 10px}
#sod_req_btn button {background:#626870}
#sod_fin_view {border:1px solid #e9e9e9}
#sod_fin_view h2 {position:absolute;font-size:0;line-height:0;overflow:hidden}
#sod_fin_view h3 {margin:0 0 10px}

3
css/mobile_shop.css
View File

@ -369,8 +369,6 @@ html.no-overflowscrolling #it_coupon_frm {height:auto;max-height:10000px !import
#sod_frm_pay .basic_tbl td {border-top:1px solid #e9e9e9 !important;border-bottom:1px solid #e9e9e9 !important;line-height:1.5em !important;word-break:break-all !important}
#sod_frm_pay #sc_coupon_frm, #sod_frm_pay #od_coupon_frm {z-index:10000;position:absolute;top:0;left:0;padding:20px;width:320px;height:auto !important;height:480px;max-height:480px;border:1px solid #000;background:#f5f6fa;overflow-y:scroll}
html.no-overflowscrolling #sc_coupon_frm, html.no-overflowscrolling #od_coupon_frm {height:auto;max-height:10000px !important} /* overflow 미지원 기기 대응 */
#sod_frm_pay .frm_input {background:#fff !important}
#sod_frm_pay .frm_input:focus {color:#000}
#sod_frm_paysel {margin:0 0 1.8em;padding:1em;border:1px solid #e9e9e9;background:#f5f6fa;text-align:center}
#sod_frm_paysel legend {position:absolute;font-size:0;line-height:0;overflow:hidden}
@ -517,7 +515,6 @@ td.empty_table {padding:5em 0;text-align:center}
.frm_tbl th {padding-left:1em;width:110px;border-top:1px solid #eee;border-bottom:1px solid #eee;font-weight:normal;text-align:left}
.frm_tbl td {padding:0.4em 0.5em;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;background:transparent}
.frm_tbl textarea, .frm_input {border:1px solid #b8c9c2;background:#f7f7f7;vertical-align:middle;line-height:1.8em;-webkit-appearance:none}
.frm_input:focus, input.required:focus {border:1px solid #21272e;background:#21272e !important;color:#fff;line-height:1.8em}
.frm_tbl textarea {width:90%;height:10em}
.frm_address {display:block;margin-top:0.3em}
.frm_file {display:block;margin-bottom:0.3em}

41
shop/orderinquiryview.php
View File

@ -91,7 +91,8 @@ if(openwin != null) {
<table class="basic_tbl">
<thead>
<tr>
<th scope="col" colspan="2">옵션항목</th>
<th scope="col">선택</th>
<th scope="col">옵션항목</th>
<th scope="col">수량</th>
<th scope="col">판매가</th>
<th scope="col">소계</th>
@ -118,10 +119,10 @@ if(openwin != null) {
$point = $opt['ct_point'] * $opt['ct_qty'];
?>
<tr>
<td>
<td class="td_chk">
<input type="hidden" name="ct_id[<?php echo $idx; ?>]" value="<?php echo $opt['ct_id']; ?>">
<label for="chk_ct_id_<?php echo $idx; ?>"><?php echo $opt['ct_option']; ?> 선택</label>
<input type="checkbox" name="chk_ct_id[<?php echo $idx; ?>]" id="chk_ct_id_<?php echo $idx; ?>" value="1">
<label for="chk_ct_id_<?php echo $idx; ?>" class="sound_only"><?php echo $opt['ct_option']; ?></label>
<input type="checkbox" name="chk_ct_id[<?php echo $idx; ?>]" value="1" id="chk_ct_id_<?php echo $idx; ?>">
</td>
<td><?php echo $opt['ct_option']; ?></td>
<td class="td_smallmng"><?php echo number_format($opt['ct_qty']); ?></td>
@ -161,6 +162,21 @@ if(openwin != null) {
?>
</ul>
<div id="request_form">
<div>
<label for="rq_content">요청내용</label>
<input type="text" name="rq_content" value="" id="rq_content" required class="required frm_input">
<input type="submit" value="확인" class="btn_frmline">
<button type="button" id="request_cancel" class="btn_cancel">닫기</button>
</div>
</div>
<div id="sod_req_btn">
<button type="button" class="req_button btn_frmline">취소요청</button>
<button type="button" class="req_button btn_frmline">교환요청</button>
<button type="button" class="req_button btn_frmline">반품요청</button>
</div>
<?php
// 총계 = 주문상품금액합계 + 배송비 - 상품할인 - 결제할인
$od_coupon = $od['od_coupon'];
@ -203,23 +219,6 @@ if(openwin != null) {
<dd class="sod_bsk_point"><strong><?php echo number_format($tot_point); ?> 점</strong></dd>
</dl>
<div id="request_form">
<div>
<label for="rq_content">요청내용</label>
<input type="text" name="rq_content" id="rq_content" value="">
</div>
<div>
<input type="submit" value="확인" required class="required">
<button type="button" id="request_cancel">취소</button>
</div>
</div>
<div>
<button type="button" class="req_button">취소요청</button>
<button type="button" class="req_button">교환요청</button>
<button type="button" class="req_button">반품요청</button>
</div>
</form>
</section>

2
skin/outlogin/shop_basic/style.css
View File

@ -6,10 +6,8 @@
#ol_before {}
#ol_before fieldset {position:relative}
#ol_id {display:block;margin:0 0 5px !important;margin:0 0 3px;padding:0 5px;width:138px;height:22px;border:1px solid #b8c9c2;background:#f7f7f7;line-height:1.6em}
#ol_id:focus {border-color:#626870;background:#21272e;color:#fff}
.ol_idlabel {position:absolute;top:6px;left:5px;color:#626870;font-size:0.95em}
#ol_pw {display:block;margin:0 0 5px !important;margin:0 0 3px;padding:0 5px;width:138px;height:22px;border:1px solid #b8c9c2;background:#f7f7f7;vertical-align:top;line-height:1.6em}
#ol_pw:focus {border-color:#626870;background:#21272e;color:#fff}
.ol_pwlabel {position:absolute;top:35px;left:5px;color:#626870;font-size:0.95em}
#auto_login {}
#auto_login_label {letter-spacing:-0.1em}