From 12ee2b02f8d6f122424d75f8a804ba7dcd4873f5 Mon Sep 17 00:00:00 2001
From: rollydream <xgirl_87x@naver.com>
Date: Thu, 4 Apr 2013 10:47:10 +0900
Subject: [PATCH] =?UTF-8?q?=EC=87=BC=ED=95=91=EB=AA=B0=EA=B4=80=EB=A6=AC?=
 =?UTF-8?q?=EC=9E=90=20:=20#32=20=EB=A7=A4=EC=B6=9C=ED=98=84=ED=99=A9=20?=
 =?UTF-8?q?=ED=91=9C=EC=A4=80=ED=99=94=20=EB=B0=8F=20=EC=8A=A4=ED=83=80?=
 =?UTF-8?q?=EC=9D=BC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/shop_admin/faqmasterlist.php |   2 +-
 adm/shop_admin/sale1.php         | 114 +++++++++++++++----------------
 adm/shop_admin/sale1month.php    |   2 +-
 adm/shop_admin/sale1year.php     |   2 +-
 4 files changed, 59 insertions(+), 61 deletions(-)

diff --git a/adm/shop_admin/faqmasterlist.php b/adm/shop_admin/faqmasterlist.php
index e7222d2ef..91bfd39f0 100644
--- a/adm/shop_admin/faqmasterlist.php
+++ b/adm/shop_admin/faqmasterlist.php
@@ -81,7 +81,7 @@ $result = sql_query($sql);
     }
 
     if ($i == 0){
-        echo '<tr><td colspan="5" class="faq_center"><span class="faq_center">자료가 한건도 없습니다.</span></td></tr>';
+        echo '<tr><td colspan="5" class="faq_center"><span>자료가 한건도 없습니다.</span></td></tr>';
     }
     ?>
     </tbody>
diff --git a/adm/shop_admin/sale1.php b/adm/shop_admin/sale1.php
index ea538d27f..fc5c08d3d 100644
--- a/adm/shop_admin/sale1.php
+++ b/adm/shop_admin/sale1.php
@@ -7,64 +7,62 @@ auth_check($auth[$sub_menu], "r");
 $g4['title'] = '매출현황';
 include_once (G4_ADMIN_PATH.'/admin.head.php');
 ?>
-
-<?//=subtitle($g4['title'])?>
-
-<table cellpadding=0 cellspacing=0 border=0>
-<colgroup width=150></colgroup>
-<colgroup width='' bgcolor=#ffffff></colgroup>
-<tr><td colspan=2 height=2 bgcolor=#0E87F9></td></tr>
-<tr height=40>
-    <form name=frm_sale_today action='./sale1today.php'>
-    <td>당일 매출현황</td>
-    <td align=right>
-        <input type=text name=date size=8 maxlength=8 value='<? echo date("Ymd", G4_SERVER_TIME) ?>' class=ed>
-        일 하루
-        <input type=submit class=btn1 value='  확  인  '>
-    </td>
-    </form>
-</tr>
-<tr><td colspan=2 height=1 bgcolor=#CCCCCC></td></tr>
-<tr height=40>
-    <form name=frm_sale_date action='./sale1date.php'>
-    <td>일별 매출현황</td>
-    <td align=right>
-        <input type=text name=fr_date size=8 maxlength=8 value='<? echo date("Ym01", G4_SERVER_TIME) ?>' class=ed>
-        일 부터
-        <input type=text name=to_date size=8 maxlength=8 value='<? echo date("Ymd", G4_SERVER_TIME) ?>' class=ed>
-        일 까지
-        <input type=submit class=btn1 value='  확  인  '>
-    </td>
-    </form>
-</tr>
-<tr><td colspan=2 height=1 bgcolor=#CCCCCC></td></tr>
-<tr height=40>
-    <form name=frm_sale_month action='./sale1month.php'>
-    <td>월별 매출현황</td>
-    <td align=right>
-        <input type=text name=fr_date size=6 maxlength=6 value='<? echo date("Y01", G4_SERVER_TIME) ?>' class=ed>
-        월 부터
-        <input type=text name=to_date size=6 maxlength=6 value='<? echo date("Ym", G4_SERVER_TIME) ?>' class=ed>
-        월 까지
-        <input type=submit class=btn1 value='  확  인  '>
-    </td>
-    </form>
-</tr>
-<tr><td colspan=2 height=1 bgcolor=#CCCCCC></td></tr>
-<tr height=40>
-    <form name=frm_sale_year action='./sale1year.php'>
-    <td>연별 매출현황</td>
-    <td align=right>
-        <input type=text name=fr_date size=4 maxlength=4 value='<? echo date("Y", G4_SERVER_TIME)-1 ?>' class=ed>
-        년 부터
-        <input type=text name=to_date size=4 maxlength=4 value='<? echo date("Y", G4_SERVER_TIME) ?>' class=ed>
-        년 까지
-        <input type=submit class=btn1 value='  확  인  '>
-    </td>
-    </form>
-</tr>
-<tr><td colspan=2 height=2 bgcolor=#0E87F9></td></tr>
-</table>
+<style type="text/css">
+    .sale1 {text-align:right}
+</style>
+<section class="cbox">
+    <h2>매출현황</h2>
+    <table class="frm_tbl">
+    <tbody>
+    <tr>
+        <form name="frm_sale_today" action="./sale1today.php">
+        <th scope="row"> 당일 매출현황</th>
+        <td class="sale1">
+            <input type="text" name="date" size="8" maxlength="8" value="<? echo date("Ymd", G4_SERVER_TIME) ?>" id="date" class="frm_input">
+            <label for="date">일 하루</label>
+            <input type="submit" value="확  인">
+        </td>
+        </form>
+    </tr>
+    <tr>
+        <form name="frm_sale_date" action="./sale1date.php">
+        <th scope="row">일별 매출현황</th>
+        <td class="sale1">
+            <input type="text" name="fr_date" value="<? echo date("Ym01", G4_SERVER_TIME) ?>" id="fr_date" class="frm_input" size="8" maxlength="8">
+            <label for="fr_date">일 부터</label>
+            <input type="text" name="to_date" value="<? echo date("Ymd", G4_SERVER_TIME) ?>" id="to_date" class="frm_input" size="8" maxlength="8">
+            <label for="to_date">일 까지</label>
+            <input type="submit" value="확  인">
+        </td>
+        </form>
+    </tr>
+    <tr>
+        <form name="frm_sale_month" action="./sale1month.php">
+        <th scope="row">월별 매출현황</th>
+        <td class="sale1">
+        <input type="text" name="fr_month" value="<? echo date("Y01", G4_SERVER_TIME) ?>" id="fr_month" class="frm_input" size="6" maxlength="6">
+        <label for="fr_month">월 부터</label>
+        <input type="text" name="to_month" value="<? echo date("Ym", G4_SERVER_TIME) ?>" id="to_month" class="frm_input" size="6" maxlength="6">
+        <label for="to_month">월 까지</label>
+        <input type="submit" value="확  인">
+        </td>
+        </form>
+    </tr>
+    <tr>
+        <form name="frm_sale_year" action="./sale1year.php">
+        <th scope="row">연별 매출현황</th>
+        <td class="sale1">
+            <input type="text" name="fr_year" size="4" maxlength="4" value="<? echo date("Y", G4_SERVER_TIME)-1 ?>"id="fr_year" class="frm_input">
+            <label for="fr_year">년 부터</label>
+            <input type="text" name="to_year" size="4" maxlength="4" value="<? echo date("Y", G4_SERVER_TIME) ?>" id="to_year" class="frm_input">
+            <label for="to_year">년 까지</label>
+            <input type="submit" value="확  인">
+        </td>
+        </form>
+    </tr>
+    </tbody>
+    </table>
+</section>
 
 <?
 include_once (G4_ADMIN_PATH.'/admin.tail.php');
diff --git a/adm/shop_admin/sale1month.php b/adm/shop_admin/sale1month.php
index 55c848f3a..facbf224f 100644
--- a/adm/shop_admin/sale1month.php
+++ b/adm/shop_admin/sale1month.php
@@ -7,7 +7,7 @@ auth_check($auth[$sub_menu], "r");
 $fr_date = preg_replace("/([0-9]{4})([0-9]{2})/", "\\1-\\2", $fr_date);
 $to_date = preg_replace("/([0-9]{4})([0-9]{2})/", "\\1-\\2", $to_date);
 
-$g4['title'] = "$fr_date ~ $to_date 매출현황";
+$g4['title'] = "$fr_month ~ $to_month 매출현황"; /*레이블 중복 인식과 페이지와의 연결 때문에 year로 바꿈 김혜련 2013-04-04*/
 include_once (G4_ADMIN_PATH.'/admin.head.php');
 
 function print_line($save)
diff --git a/adm/shop_admin/sale1year.php b/adm/shop_admin/sale1year.php
index d35878cd0..c0b43081e 100644
--- a/adm/shop_admin/sale1year.php
+++ b/adm/shop_admin/sale1year.php
@@ -4,7 +4,7 @@ include_once('./_common.php');
 
 auth_check($auth[$sub_menu], "r");
 
-$g4['title'] = "$fr_date ~ $to_date 매출현황";
+$g4['title'] = "$fr_year ~ $to_year 매출현황"; /*레이블 중복 인식과 페이지와의 연결 때문에 year로 바꿈 김혜련 2013-04-04*/
 include_once (G4_ADMIN_PATH.'/admin.head.php');
 
 function print_line($save)