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

adm/shop_admin/itemexcelupdate.php

@@ -199,7 +199,9 @@ include_once(G5_PATH.'/head.sub.php');
 <div class="new_win">
     <h1><?php echo $g5['title']; ?></h1>
 
-    <p class="new_win_desc">상품등록을 완료했습니다.</p>
+    <div class="local_desc01 local_desc">
+        <p>상품등록을 완료했습니다.</p>
+    </div>
 
     <dl id="excelfile_result">
         <dt>총상품수</dt>

adm/shop_admin/newwinlist.php

@@ -62,7 +62,7 @@ $result = sql_query($sql);
     <tr class="<?php echo $bg; ?>">
         <td class="td_num"><?php echo $row['nw_id']; ?></td>
         <td><?php echo $row['nw_subject']; ?></td>
-        <td><?php echo $nw_device; ?></td>
+        <td class="td_device"><?php echo $nw_device; ?></td>
         <td class="td_datetime"><?php echo substr($row['nw_begin_time'],2,14); ?></td>
         <td class="td_datetime"><?php echo substr($row['nw_end_time'],2,14); ?></td>
         <td class="td_num"><?php echo $row['nw_disable_hours']; ?>시간</td>

adm/shop_admin/orderdelivery.php

@@ -32,7 +32,7 @@ include_once(G5_PATH.'/head.sub.php');
         <input type="file" name="excelfile" id="excelfile">
     </div>
 
-    <div>
+    <div id="excelfile_input">
         <input type="checkbox" name="od_send_mail" value="1" id="od_send_mail" checked="checked">
         <label for="od_send_mail">배송안내 메일</label>
         <input type="checkbox" name="send_sms" value="1" id="od_send_sms" checked="checked">

adm/shop_admin/orderdeliveryupdate.php

@@ -166,22 +166,24 @@ include_once(G5_PATH.'/head.sub.php');
 <div class="new_win">
     <h1><?php echo $g5['title']; ?></h1>
 
-    <p class="new_win_desc">배송일괄처리를 완료했습니다.</p>
+    <div class="local_desc01 local_desc">
+        <p>배송일괄처리를 완료했습니다.</p>
+    </div>
 
     <dl id="excelfile_result">
         <dt>총배송건수</dt>
         <dd><?php echo number_format($total_count); ?></dd>
-        <dt>완료건수</dt>
-        <dd><?php echo number_format($succ_count); ?></dd>
-        <dt>실패건수</dt>
-        <dd><?php echo number_format($fail_count); ?></dd>
+        <dt class="result_done">완료건수</dt>
+        <dd class="result_done"><?php echo number_format($succ_count); ?></dd>
+        <dt class="result_fail">실패건수</dt>
+        <dd class="result_fail"><?php echo number_format($fail_count); ?></dd>
         <?php if($fail_count > 0) { ?>
         <dt>실패주문코드</dt>
         <dd><?php echo implode(', ', $fail_od_id); ?></dd>
         <?php } ?>
     </dl>
 
-    <div class="btn_win01 btn_win">
+    <div class="btn_confirm01 btn_confirm">
         <button type="button" onclick="window.close();">창닫기</button>
     </div>
 

adm/shop_admin/orderlist.php

@@ -119,7 +119,7 @@ $listall = '<a href="'.$_SERVER['PHP_SELF'].'" class="ov_listall">전체목록</
     <?php echo $listall; ?>
     전체 주문내역 <?php echo number_format($total_count); ?>건
     <?php if($od_status == '준비' && $total_count > 0) { ?>
-    <a href="./orderdelivery.php" id="order_delivery">엑셀배송처리</a>
+    <a href="./orderdelivery.php" id="order_delivery" class="ov_a">엑셀배송처리</a>
     <?php } ?>
 </div>
 

adm/shop_admin/sendcostzipcode.php

@@ -50,34 +50,36 @@ include_once(G5_PATH.'/head.sub.php');
 
 
 <div id="sendcost_postal_win" class="new_win">
-    <h1 id="new_win_title"><?php echo $g5['title']; ?></h1>
+    <h1><?php echo $g5['title']; ?></h1>
 
 
     <form name="fzipcode" id="fzipcode" method="get">
     <input type="hidden" name="no" value="<?php echo $no; ?>">
 
-    <p class="new_win_desc">주소지의 시/군을 입력하세요.</p>
+    <div class="local_desc01 local_desc">
+        <p>주소지의 시/군을 입력하세요.</p>
 
-    <fieldset>
-        <label for="addr">주소</label>
-        <input type="text" name="addr" value="<?php echo stripslashes($addr); ?>" id="addr" class="frm_input" size="20">
-        <input type="submit" value=" 검색 " class="btn_frmline">
-    </fieldset>
+        <fieldset>
+            <label for="addr">주소</label>
+            <input type="text" name="addr" value="<?php echo stripslashes($addr); ?>" id="addr" class="frm_input" size="20">
+            <input type="submit" value=" 검색 " class="btn_frmline">
+        </fieldset>
 
-    </form>
+        </form>
 
-    <?php if($search_count) { ?>
-    <strong class="new_win_desc">검색결과</strong>
-    <ul>
-        <?php
-        for($i=0; $i<$search_count; $i++) {
-        ?>
-        <li><?php echo $result[$i]; ?></li>
+        <?php if($search_count) { ?>
+        <strong>검색결과</strong>
+        <ul>
+            <?php
+            for($i=0; $i<$search_count; $i++) {
+            ?>
+            <li><?php echo $result[$i]; ?></li>
+            <?php } ?>
+        </ul>
+        <?php } else { ?>
+        <p>검색된 결과가 없습니다.</p>
         <?php } ?>
-    </ul>
-    <?php } else { ?>
-    <p class="new_win_desc">검색된 결과가 없습니다.</p>
-    <?php } ?>
+    </div>
 
     <div class="btn_win01 btn_win">
         <a href="javascript:window.close();">창닫기</a>

css/admin.css

@@ -246,6 +246,7 @@ legend {position:absolute;width:0;height:0;font-size:0;line-height:0;text-indent
 
 .local_ov01 {position:relative;margin:-10px 0 10px;padding:10px 20px;border-bottom:1px solid #e9e9e9;background:#f2f5f9}
 .local_ov01 .ov_listall {display:inline-block;margin:0 5px 0 0;padding:0 10px 0 0;border-right:1px solid #ccc}
+.local_ov01 .ov_a {display:inline-block;margin:0 0 0 5px;padding:0 0 0 10px;border-left:1px solid #ccc;color:#ff3061}
 
 
 /* 테이블 */
@@ -369,6 +370,7 @@ tfoot td {font-weight:bold;text-align:center}
 .td_datetime {width:130px;text-align:center}
 .td_delicom {width:100px}
 .td_delino {width:130px}
+.td_device {width:70px;text-align:center}
 .td_etc {width:80px;text-align:center}
 .td_extra label {display:inline-block;width:100px}
 .td_extra input {margin-right:5px;width:130px}
@@ -646,10 +648,13 @@ strong.sodr_nonpay {display:block;padding:5px 0;text-align:right}
 /* 상품 일괄 등록 */
 #excelfile_upload {margin:10px auto 20px;padding:20px;width:86%;border:1px solid #e9e9e9;background:#fff}
 #excelfile_upload label {font-weight:bold}
-#excelfile_result {margin:0 auto 20px;padding:20px;width:86%;border:1px solid #e9e9e9;background:#fff;zoom:1}
+#excelfile_input {margin:0 0 20px;text-align:center}
+#excelfile_result {margin:0 20px 20px;border-bottom:1px solid #e9e9e9;zoom:1}
 #excelfile_result:after {display:block;visibility:hidden;clear:both;content:""}
-#excelfile_result dt {clear:both;float:left;padding:10px 0;width:40%}
+#excelfile_result dt {clear:both;float:left;padding:10px 0;width:40%;font-weight:bold}
 #excelfile_result dd {float:left;margin:0;padding:10px 0;width:60%}
+#excelfile_result .result_done {color:#5d910b}
+#excelfile_result .result_fail {color:#ff3061}
 
 /* 상품옵션재고관리 */
 .sit_stock_qty_alert {color:#ff1133;font-weight:bold}
@@ -737,11 +742,10 @@ strong.sodr_nonpay {display:block;padding:5px 0;text-align:right}
 .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%}
 .new_win .anchor {margin:0 auto 5px;width:93%}
 .new_win .tbl_wrap {margin:0 20px 20px;padding:0}
 
-.new_win .local_sch, .new_win .local_cmd, .new_win .local_desc01, .new_win .local_desc02, .new_win .local_ov {min-width:480px}
+.new_win .local_sch, .new_win .local_cmd, .new_win .local_desc01, .new_win .local_desc02, .new_win .local_ov {min-width:320px}
 
 /* 자바스크립트 alert 대안 */
 #validation_check {margin:100px auto;width:500px}