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

adm/shop_admin/configform.php

@@ -733,7 +733,7 @@ $pg_anchor ="<ul class=\"anchor\">
         <th scope="row"><label for="de_register">프로그램 등록번호</label></th>
         <td>
             <?=help("정품에 한해 발급해 드립니다. 등록번호가 없거나 틀리면, 주문서를 확인할 수 없습니다.\n등록번호는 서버 IP, MYSQL USER, DB 를 알려주셔야 발급이 가능합니다.", -180, -160);?>
-            <input type="text" name="de_register" value="<?=$default['de_register']?>" id="de_register" class="frm_input" required size="30">
+            <input type="text" name="de_register" value="<?=$default['de_register']?>" id="de_register" class="frm_input required" required size="30">
         </td>
     </tr>
     </tbody>

adm/shop_admin/newwinform.php

@@ -5,7 +5,7 @@ include_once(G4_CKEDITOR_PATH.'/ckeditor.lib.php');
 
 auth_check($auth[$sub_menu], "w");
 
-$html_title = "새창";
+$html_title = "팝업레이어";
 if ($w == "u")
 {
     $html_title .= " 수정";
@@ -33,63 +33,70 @@ include_once (G4_ADMIN_PATH.'/admin.head.php');
 <input type="hidden" name="nw_id" value="<? echo $nw_id ?>">
 
 <section class="cbox">
-    <h2>새창 입력 수정</h2>
-    <p><?=help("쇼핑몰 초기화면 접속 시 자동으로 뜰 새창을 설정/관리합니다.")?></p>
+    <h2><?=$html_title?></h2>
+    <p><?=help("쇼핑몰 초기화면 접속 시 자동으로 뜰 팝업레이어를 설정합니다.")?></p>
     <table class="frm_tbl">
     <colgroup>
         <col class="grid_3">
-        <col class="grid_5">
-        <col class="grid_3">
-        <col class="grid_5">
+        <col class="grid_12">
     </colgroup>
     <tbody>
     <tr>
         <th scope="row"><label for="nw_disable_hours">시간</label></th>
-        <td colspan="3"><input type="text" name="nw_disable_hours" value="<? echo $nw['nw_disable_hours'] ?>" id="nw_disable_hours" required class="frm_input required" size="5"> 시간 동안 다시 띄우지 않음</td>
+        <td>
+            <?=help("고객이 다시 보지 않음을 선택할 시 몇 시간동안 팝업레이어를 보여주지 않을지 설정합니다.")?>
+            <input type="text" name="nw_disable_hours" value="<? echo $nw['nw_disable_hours'] ?>" id="nw_disable_hours" required class="frm_input required" size="5"> 시간
+        </td>
     </tr>
     <tr>
         <th scope="row"><label for="nw_begin_time">시작일시</label></th>
         <td>
             <input type="text" name="nw_begin_time" value="<? echo $nw['nw_begin_time'] ?>" id="nw_begin_time" required class="frm_input required" size="21" maxlength="19">
+            <label for="nw_begin_chk">시작일시를 오늘로</label>
             <input type="checkbox" name="nw_begin_chk" value="<? echo date("Y-m-d 00:00:00", G4_SERVER_TIME); ?>" id="nw_begin_chk" onclick="if (this.checked == true) this.form.nw_begin_time.value=this.form.nw_begin_chk.value; else this.form.nw_begin_time.value = this.form.nw_begin_time.defaultValue;">
-            <label for="nw_begin_chk">오늘</label>
         </td>
+    </tr>
+    <tr>
         <th scope="row"><label for="nw_end_time">종료일시</label></th>
         <td>
-            <input type="text" name="nw_end_time" value="<? echo $nw['nw_end_time'] ?>" id="nw_end_time" required class="frm_input requried" size="21" maxlength="19">
+            <input type="text" name="nw_end_time" value="<? echo $nw['nw_end_time'] ?>" id="nw_end_time" required class="frm_input required" size="21" maxlength="19">
+            <label for="nw_end_chk">종료일시를 오늘로부터 7일 후로</label>
             <input type="checkbox" name="nw_end_chk" value="<? echo date("Y-m-d 23:59:59", G4_SERVER_TIME+(60*60*24*7)); ?>" id="nw_end_chk" onclick="if (this.checked == true) this.form.nw_end_time.value=this.form.nw_end_chk.value; else this.form.nw_end_time.value = this.form.nw_end_time.defaultValue;">
-            <label for="nw_end_chk">오늘+7일</label>
         </td>
     </tr>
     <tr>
-        <th scope="row"><label for="nw_left">창위치 왼쪽</label></th>
+        <th scope="row"><label for="nw_left">팝업레이어 좌측 위치</label></th>
         <td>
-           <input type="text" name="nw_left" value="<? echo $nw['nw_left'] ?>" id="nw_left" required class="frm_input requried" size="5">
-        </td>
-        <th scope="row"><label for="nw_top">창위치 위</label></th>
-        <td>
-            <input type="text" name="nw_top" value="<? echo $nw['nw_top'] ?>" id="nw_top" required class="frm_input requried"  size="5">
+           <input type="text" name="nw_left" value="<? echo $nw['nw_left'] ?>" id="nw_left" required class="frm_input required" size="5"> px
         </td>
     </tr>
     <tr>
-        <th scope="row"><label for="nw_width">창크기 폭</label></th>
+        <th scope="row"><label for="nw_top">팝업레이어 상단 위치</label></th>
         <td>
-            <input type="text" name="nw_width" value="<? echo $nw['nw_width'] ?>" id="nw_width" required class="frm_input requried" size="5">
-        </td>
-        <th scope="row"><label for="nw_height">창크기 높이</label></th>
-        <td>
-            <input type="text" name="nw_height" value="<? echo $nw['nw_height'] ?>" id="nw_height" required class="frm_input requried" size="5">
+            <input type="text" name="nw_top" value="<? echo $nw['nw_top'] ?>" id="nw_top" required class="frm_input required"  size="5"> px
         </td>
     </tr>
     <tr>
-        <th scope="row"><label for="nw_subject">창제목</label></th>
-        <td colspan="3">
-            <input type="text" name="nw_subject" size="80" value="<? echo stripslashes($nw['nw_subject']) ?>" id="nw_subject" required class="frm_input requried">
+        <th scope="row"><label for="nw_width">팝업레이어 넓이</label></th>
+        <td>
+            <input type="text" name="nw_width" value="<? echo $nw['nw_width'] ?>" id="nw_width" required class="frm_input required" size="5"> px
+        </td>
+    </tr>
+    <tr>
+        <th scope="row"><label for="nw_height">팝업레이어 높이</label></th>
+        <td>
+            <input type="text" name="nw_height" value="<? echo $nw['nw_height'] ?>" id="nw_height" required class="frm_input required" size="5"> px
+        </td>
+    </tr>
+    <tr>
+        <th scope="row"><label for="nw_subject">팝업 제목</label></th>
+        <td>
+            <input type="text" name="nw_subject" value="<? echo stripslashes($nw['nw_subject']) ?>" id="nw_subject" required class="frm_input required" size="80">
         </td>
     </tr>
     <tr>
         <th scope="row">내용</th>
-        <td colspan="3"><?=editor_html('nw_content', $nw['nw_content']);?></td>
+        <td><?=editor_html('nw_content', $nw['nw_content']);?></td>
     </tr>
     </tbody>
     </table>
@@ -118,8 +125,6 @@ function frmnewwin_check(f)
     }
     return true;
 }
-
-// document.frmnewwin.nw_subject.focus();
 </script>
 
 <?

adm/shop_admin/newwinlist.php

@@ -4,7 +4,7 @@ include_once('./_common.php');
 
 auth_check($auth[$sub_menu], "r");
 
-$g4['title'] = '새창관리';
+$g4['title'] = '팝업레이어 관리';
 include_once (G4_ADMIN_PATH.'/admin.head.php');
 
 $sql_common = " from {$g4['shop_new_win_table']} ";
@@ -18,69 +18,49 @@ $sql = "select * $sql_common order by nw_id desc ";
 $result = sql_query($sql);
 ?>
 
-<style type="text/css">
-    .newwin_center{text-align:center}
-</style>
-
 <section class="cbox">
-    <h2>새창관리</h2>
-    <p>건수 <? echo $total_count ?></p>
+    <h2>팝업레이어 관리</h2>
+    <p>추가된 팝업레이어 <? echo $total_count ?>건</p>
     <div id="btn_add">
         <a href="./newwinform.php">새창관리추가</a>
     </div>
-    <table>
-    <colgroup>
-        <col class="grid_1">
-        <col class="grid_2">
-        <col class="grid_2">
-        <col class="grid_1">
-        <col class="grid_1">
-        <col class="grid_1">
-        <col class="grid_1">
-        <col class="grid_1">
-        <col class="grid_6">
-        <col class="grid_2">
-    </colgroup>
+    <table id="spop_list">
     <thead>
     <tr>
         <th scope="col">번호</th>
+        <th scope="col">제목</th>
         <th scope="col">시작일시</th>
         <th scope="col">종료일시</th>
         <th scope="col">시간</th>
         <th scope="col">Left</th>
         <th scope="col">Top</th>
-        <th scope="col">Height</th>
         <th scope="col">Width</th>
-        <th scope="col">제목</th>
+        <th scope="col">Height</th>
         <th scope="col">관리</th>
     </tr>
     </thead>
     <tbody>
-    <?
-    for ($i=0; $row=mysql_fetch_array($result); $i++)
-    {
-        $s_mod = icon("수정", "./newwinform.php?w=u&nw_id={$row['nw_id']}");
-        $s_del = icon("삭제", "javascript:del('./newwinformupdate.php?w=d&nw_id={$row['nw_id']}');");
-
-        $list = $i%2;
-        ?>
+    <? for ($i=0; $row=mysql_fetch_array($result); $i++) { ?>
         <tr>
-            <td class="newwin_center"><?=$row['nw_id']?></td>
-            <td><?=substr($row['nw_begin_time'],2,14)?></td>
-            <td><?=substr($row['nw_end_time'],2,14)?></td>
-            <td class="newwin_center"><?=$row['nw_disable_hours']?></td>
-            <td class="newwin_center"><?=$row['nw_left']?></td>
-            <td class="newwin_center"><?=$row['nw_top']?></td>
-            <td class="newwin_center"><?=$row['nw_height']?></td>
-            <td class="newwin_center"><?=$row['nw_width']?></td>
+            <td class="td_num"><?=$row['nw_id']?></td>
             <td><?=$row['nw_subject']?></td>
-            <td class="newwin_center"><a href="./newwinform.php?w=u&nw_id=<?=$row['nw_id']?>">수정</a> <a href="./newwinformupdate.php?w=d&nw_id=<?=$row['nw_id']?>">삭제</a></td>
+            <td class="td_time"><?=substr($row['nw_begin_time'],2,14)?></td>
+            <td class="td_time"><?=substr($row['nw_end_time'],2,14)?></td>
+            <td><?=$row['nw_disable_hours']?>시간</td>
+            <td><?=$row['nw_left']?>px</td>
+            <td><?=$row['nw_top']?>px</td>
+            <td><?=$row['nw_width']?>px</td>
+            <td><?=$row['nw_height']?>px</td>
+            <td class="td_smallmng">
+                <a href="./newwinform.php?w=u&nw_id=<?=$row['nw_id']?>">수정</a>
+                <a href="./newwinformupdate.php?w=d&nw_id=<?=$row['nw_id']?>">삭제</a>
+            </td>
         </tr>
-        <?
+    <?
     }
 
     if ($i == 0) {
-        echo '<tr><td colspan="10" class="newwin_center"><span>자료가 한건도 없습니다.</span></td></tr>';
+        echo '<tr><td colspan="10" class="empty_table">자료가 한건도 없습니다.</td></tr>';
     }
     ?>
     </tbody>

adm/shop_admin/orderlist.php

@@ -141,12 +141,12 @@ if ($search) // 검색렬일 때만 처음 버튼을 보여줌
     <tr class="orderlist">
         <th scope="row" colspan="2">합 계</td>
         <td><?=(int)$tot_itemcount?>건</td>
-        <td class="td_sodr_sum"><?=number_format($tot_orderamount)?></td>
+        <td><?=number_format($tot_orderamount)?></td>
         <td><?=number_format($tot_ordercancel)?></td>
         <td><?=number_format($tot_dc_amount)?></td>
-        <td class="td_sodr_sum"><?=number_format($tot_receiptamount)?></td>
+        <td><?=number_format($tot_receiptamount)?></td>
         <td><?=number_format($tot_receiptcancel)?></td>
-        <td class="td_sodr_nonpay"><?=number_format($tot_misu)?></td>
+        <td><?=number_format($tot_misu)?></td>
         <td colspan="2"></td>
     </tr>
     </tfoot>
@@ -210,7 +210,7 @@ if ($search) // 검색렬일 때만 처음 버튼을 보여줌
                     <?=$lines[$i]['mb_id']?>
                 </a>
             </td>
-            <td class="td_sodr_cnt"><b><?=$lines[$i]['itemcount']?></b>건<br><span class="sodr_tot">누적 <?=$row2['cnt']?>건</span></td>
+            <td class="td_sodr_cnt"><b><?=$lines[$i]['itemcount']?></b>건<br>누적 <?=$row2['cnt']?>건</td>
             <td class="td_sodr_sum"><?=number_format($lines[$i]['orderamount'])?></td>
             <td><?=number_format($lines[$i]['ordercancel'])?></td>
             <td><?=number_format($lines[$i]['od_dc_amount'])?></td>

css/admin.css

@@ -234,7 +234,7 @@ td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9
 /* 회원메일발송 목록 */
 .td_test, .td_send {width:50px;text-align:center}
 .td_mng {width:110px;text-align:center}
-.td_smallmng {width:50px;text-align:center}
+.td_smallmng {width:60px;text-align:center}
 /* 투표관리 목록 */
 .td_etc {width:80px;text-align:center}
 /* 게시판관리 목록 */
@@ -321,11 +321,13 @@ td {padding:8px 5px 6px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9
 #sodr_list {text-align:center}
 .td_sodr_sum {color:#1275d3}
 .td_sodr_nonpay {color:#ff6600}
-.sodr_tot {color:#bbb}
 
 /* 분류관리 목록 */
 .cate_list_lbl {display:inline-block;padding-left:15px;background:url('../adm/shop_admin/img/icon_reply.gif') 0 2px no-repeat}
 
+/* 팝업레이어 관리 */
+#spop_list {text-align:center}
+
 
 /* 새창 기본 스타일 */
 .new_win {}