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

2013-04-22 16:24:37 +09:00
parent 3cdabf7c06 ebd9df2490
commit 598e11d14d
6 changed files with 73 additions and 65 deletions
--- a/adm/shop_admin/configform.php
+++ b/adm/shop_admin/configform.php
@ -64,17 +64,17 @@ $g4['title'] = '쇼핑몰설정';
 include_once (G4_ADMIN_PATH.'/admin.head.php');

 $pg_anchor = '<ul class="anchor">
-<li><a href="#anc_cf_info">사업자정보</a></li>
-<li><a href="#anc_cf_index">쇼핑몰 초기화면</a></li>
-<li><a href="#anc_cf_payment">결제설정</a></li>
-<li><a href="#anc_cf_delivery">배송설정</a></li>
-<li><a href="#anc_cf_etc">기타설정</a></li>
-<li><a href="#anc_cf_sms">SMS설정</a></li>
+<li><a href="#anc_scf_info">사업자정보</a></li>
+<li><a href="#anc_scf_index">쇼핑몰 초기화면</a></li>
+<li><a href="#anc_scf_payment">결제설정</a></li>
+<li><a href="#anc_scf_delivery">배송설정</a></li>
+<li><a href="#anc_scf_etc">기타설정</a></li>
+<li><a href="#anc_scf_sms">SMS설정</a></li>
 </ul>';
 ?>

 <form name="fconfig" action="./configformupdate.php" onsubmit="return fconfig_check(this)" method="post" enctype="MULTIPART/FORM-DATA">
-<section id="anc_cf_info" class="cbox">
+<section id="anc_scf_info" class="cbox">
    <h2>사업자정보</h2>
    <?=$pg_anchor?>
    <p><?=help("사업자정보는 tail.php 와 content.php 에서 표시합니다.")?></p>
@ -147,7 +147,7 @@ $pg_anchor = '<ul class="anchor">
    </table>
 </section>

-<section id="anc_cf_index" class="cbox">
+<section id="anc_scf_index" class="cbox">
    <h2>쇼핑몰 초기화면</h2>
    <?=$pg_anchor?>
    <p><?=help("상품관리에서 선택한 상품의 타입대로 쇼핑몰 초기화면에 출력합니다. (상품 타입 히트/추천/최신/인기/할인)\n각 타입별로 선택된 상품이 없으면 쇼핑몰 초기화면에 출력하지 않습니다.")?></p>
@ -257,7 +257,7 @@ $pg_anchor = '<ul class="anchor">
 </section>


-<section id ="frm_payment" class="cbox">
+<section id ="anc_scf_payment" class="cbox">
    <h2>결제정보</h2>
    <?=$pg_anchor?>
    <table class="frm_tbl">
@ -531,7 +531,7 @@ $pg_anchor = '<ul class="anchor">
    </table>
 </section>

-<section id="anc_cf_delivery" class="cbox">
+<section id="anc_scf_delivery" class="cbox">
    <h2 >배송정보</h2>
     <?=$pg_anchor?>
    <table class="frm_tbl">
@ -592,7 +592,7 @@ $pg_anchor = '<ul class="anchor">
    </table>
 </section>

-<section id="anc_cf_etc" class="cbox">
+<section id="anc_scf_etc" class="cbox">
    <h2>기타정보</h2>
    <?=$pg_anchor?>
    <table class="frm_tbl">
@ -793,7 +793,7 @@ function byte_check(el_cont, el_byte)

 </style>

-<section id="anc_cf_sms" class="cbox" >
+<section id="anc_scf_sms" class="cbox" >
    <h2>SMS설정</h2>
    <?=$pg_anchor?>

--- a/adm/shop_admin/deliverycodelist.php
+++ b/adm/shop_admin/deliverycodelist.php
@ -45,7 +45,7 @@ $result = sql_query($sql);
        <td class="td_bignum"><?=$row['dl_tel']?></td>
        <td class="td_num"><?=$row['dl_order']?></td>
        <td class="td_mng">
-            <a href="<?=$row['dl_url']?>" target="_blank">홈페이지</a>
+            <a href="<?=$row['dl_url']?>" target="_blank"><img src="./img/icon_view.jpg" alt="<?=stripslashes($row['dl_company'])?> 홈페이지"></a>
            <a href="./deliverycodeform.php?w=u&amp;dl_id=<?=$row['dl_id']?>"><img src="./img/icon_mod.jpg" alt="<?=stripslashes($row['dl_company'])?> 수정"></a>
            <a href="javascript:del('./deliverycodeformupdate.php?w=d&amp;dl_id=<?=$row['dl_id']?>');"><img src="./img/icon_del.jpg" alt="<?=stripslashes($row['dl_company'])?> 삭제"></a>
        </td>
--- a/adm/shop_admin/itemeventwin.php
+++ b/adm/shop_admin/itemeventwin.php
@ -7,52 +7,54 @@ auth_check($auth[$sub_menu], "r");
 $sql = " select ev_subject from {$g4['shop_event_table']} where ev_id = '$ev_id' ";
 $ev = sql_fetch($sql);

-$g4['title'] = '['.$ev['ev_subject'].'] 이벤트상품';
+$g4['title'] = $ev['ev_subject'].' 이벤트상품';
 include_once(G4_PATH.'/head.sub.php');
 ?>

-<link rel="stylesheet" href="./admin.style.css" type="text/css">
+<div class="cbox">
+    <h1><?=$g4['title']?></h1>
+    <table>
+    <thead>
+    <tr>
+        <th scope="col">상품명</th>
+        <th scope="col">사용구분</th>
+        <th scope="col">삭제</th>
+    </tr>
+    </thead>
+    <tbody>
+    <?
+    $sql = " select b.it_id, b.it_name, b.it_use from {$g4['shop_event_item_table']} a
+               left join {$g4['shop_item_table']} b on (a.it_id=b.it_id)
+              where a.ev_id = '$ev_id'
+              order by b.it_id desc ";
+    $result = sql_query($sql);
+    for ($i=0; $row=sql_fetch_array($result); $i++)
+    {
+        $href = G4_SHOP_URL.'/item.php?it_id='.$row['it_id'];
+    ?>
+    <tr>
+        <td>
+            <a href="<?=$href?>" target="_blank">
+                <?=get_it_image($row['it_id'].'_s', 40, 40)?>
+                <?=cut_str(stripslashes($row['it_name']), 60, "&#133")?>
+            </a>
+        </td>
+        <td class="td_smallmng"><?=($row['it_use']?"사용":"미사용")?></td>
+        <td class="td_smallmng"><a href="javascript:del('./itemeventwindel.php?ev_id=$ev_id&amp;it_id=<?=$row['it_id']?>');"><img src="./img/icon_del.jpg" alt="<?=$ev['ev_subject']?> 이벤트에서 삭제 : <?=cut_str(stripslashes($row['it_name']), 60, "&#133")?>"></a></td>
+    <tr>
+    <?
+    }
+    if ($i == 0)
+        echo '<tr><td colspan="3" class="empty_table">자료가 없습니다.</td></tr>';
+    ?>
+    </tbody>
+    </table>

-<table width=100% cellpadding=8><tr><td>
+</div>

-<?//=subtitle($g4['title']);?>
-<table cellpadding=4 cellspacing=1 width=100%>
-<tr><td colspan=20 height=3 bgcolor=0E87F9></td></tr>
-<tr align=center>
-    <td colspan=2>상품명</td>
-    <td width=60>사용구분</td>
-    <td width=60>삭제</td>
-</tr>
-<tr><td colspan=20 height=1 bgcolor=#CCCCCC></td></tr>
-<tr><td colspan=20 height=3 bgcolor=#F8F8F8></td></tr>
-
-<?
-$sql = " select b.it_id, b.it_name, b.it_use from {$g4['shop_event_item_table']} a
-           left join {$g4['shop_item_table']} b on (a.it_id=b.it_id)
-          where a.ev_id = '$ev_id'
-          order by b.it_id desc ";
-$result = sql_query($sql);
-for ($i=0; $row=sql_fetch_array($result); $i++)
-{
-    $href = G4_SHOP_URL."/item.php?it_id={$row['it_id']}";
-
-    echo "
-    <tr align=center>
-        <td width=50><a href='$href' target=_blank>".get_it_image($row['it_id'].'_s', 40, 40)."</a></td>
-        <td align=left><a href='$href' target=_blank>".cut_str(stripslashes($row['it_name']), 60, "&#133")."</a></td>
-        <td>".($row['it_use']?"사용":"미사용")."</td>
-        <td>".icon("삭제", "javascript:del('./itemeventwindel.php?ev_id=$ev_id&amp;it_id={$row['it_id']}');")."</td>
-    <tr>";
-}
-
-if ($i == 0)
-    echo "<tr><td colspan=20 align=center height=100 bgcolor=#ffffff class=point>자료가 한건도 없습니다.</td></tr>";
-?>
-
-<tr><td colspan=20 height=1 bgcolor=CCCCCC></td></tr>
-</table>
-
-</td></tr></table>
+<div class="btn_win">
+    <button type="button" onclick="javascript:window.close()">창 닫기</button>
+</div>

 <?
 include_once(G4_PATH.'/tail.sub.php');
--- a/adm/shop_admin/orderform.php
+++ b/adm/shop_admin/orderform.php
@ -442,7 +442,7 @@ $pg_anchor = '<ul class="anchor">
            $bank_account .= '<option value="">선택하십시오</option>'.PHP_EOL;
            for ($i=0; $i<count($str); $i++) {
                $str[$i] = str_replace("\r", "", $str[$i]);
-                $bank_account .= '<option value="'.$str[$i].'" '.get_selected($od_bank_account, $str[$i]).'>'.$str[$i].'</option>'.PHP_EOL;
+                $bank_account .= '<option value="'.$str[$i].'" '.get_selected($od['od_bank_account'], $str[$i]).'>'.$str[$i].'</option>'.PHP_EOL;
            }
            $bank_account .= "</select> ";
        }
@ -564,7 +564,7 @@ $pg_anchor = '<ul class="anchor">
                    $result = sql_query($sql);
                    for ($i=0; $row=sql_fetch_array($result); $i++) {
                    ?>
-                    <option value="<?=$row['dl_id']?>" <?=get_selected($dl_id, $row['dl_id'])?>><?=$row['dl_company']?></option>
+                    <option value="<?=$row['dl_id']?>" <?=get_selected($od['dl_id'], $row['dl_id'])?>><?=$row['dl_company']?></option>
                    <?
                    }
                    mysql_free_result($result);
--- a/adm/shop_admin/smssend.php
+++ b/adm/shop_admin/smssend.php
@ -59,28 +59,28 @@ if ($default['de_sms_use'] == 'icode') { // 아이코드 사용
                    <?
                    $yy = date("Y");
                    for ($i=$yy; $i<=$yy+1; $i++) {
-                        echo '<option value="'.$i.'"'.get_selected($i, $yy).'>'.substr($i,-2).'</option>';
+                        echo '<option value="'.$i.'">'.substr($i,-2).'</option>';
                    }
                    ?>
-                </select>년
+                </select> 년
                <label for="reserved_month" class="sound_only">월 설정</label>
                <select name="reserved_month" id="reserved_month">
                    <?
                    $mm = date("n");
                    for ($i=1; $i<=12; $i++) {
-                        echo '<option value="'.$i.'"'.get_selected($i, $mm).'>'.$i.'</option>';
+                        echo '<option value="'.$i.'">'.$i.'</option>';
                    }
                    ?>
-                </select>월
+                </select> 월
                <label for="reserved_day" class="sound_only">일 설정</label>
                <select name="reserved_day" id="reserved_day">
                    <?
                    $dd = date("j");
                    for ($i=1; $i<=31; $i++) {
-                        echo '<option value="'.$i.'"'.get_selected($i, $dd).'>'.$i.'</option>';
+                        echo '<option value="'.$i.'">'.$i.'</option>';
                    }
                    ?>
-                </select>일
+                </select> 일
                <label for="reserved_hour" class="sound_only">시 설정</label>
                <select name="reserved_hour" id="reserved_hour">
                    <?
@ -88,7 +88,7 @@ if ($default['de_sms_use'] == 'icode') { // 아이코드 사용
                        echo '<option value="'.$i.'">'.$i.'</option>';
                    }
                    ?>
-                </select>시
+                </select> 시
                <label for="reserved_minute" class="sound_only">분 설정</label>
                <select name="reserved_minute" id="reserved_minute">
                    <?
@ -96,7 +96,7 @@ if ($default['de_sms_use'] == 'icode') { // 아이코드 사용
                        echo '<option value="'.$i.'">'.$i.'</option>';
                    }
                    ?>
-                </select>분
+                </select> 분
            </td>
        </tr>
        </tbody>
--- a/css/admin.css
+++ b/css/admin.css
@ -144,6 +144,12 @@ fieldset .btn_submit:focus {height:21px;background:#555;line-height:1.7em}
 .btn_frmline:hover,
 .btn_frmline:active {text-decoration:none}

+.btn_win {clear:both;margin-bottom:20px;text-align:center} /* 새창용 */
+.btn_win a,
+.btn_win button {display:inline-block;padding:0 10px;height:22px;border:1px solid #ccc;background:#fafafa;line-height:2em}
+.btn_win a:focus,
+.btn_win a:hover {text-decoration:none}
+
 .btn_list input,
 .btn_list button {padding:0 15px;height:28px;border:0;background:#617d46;color:#fff;line-height:2.2em;vertical-align:middle}
 .btn_list input:focus,
@ -360,7 +366,7 @@ td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9
 /* ########## 쇼핑몰 사용시 적용 ########## */

 /* 쇼핑몰 설정 */
-#anc_cf_payment textarea {height:50px}
+#anc_scf_payment textarea {height:50px}

 #scf_cardtest_btn {margin-left:5px;vertical-align:middle}
 #scf_cardtest_tip {margin:10px 0 0;padding:10px;border:3px solid #ddd}