From 79522682269eb1456a52568a7f6a847886de04c8 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Wed, 12 Mar 2014 11:56:25 +0900
Subject: [PATCH 1/8] =?UTF-8?q?1:1=EB=AC=B8=EC=9D=98=20=EC=83=81=EB=8B=A8?=
 =?UTF-8?q?=20=ED=95=98=EB=8B=A8=20=EC=84=A4=EC=A0=95=20=ED=95=AD=EB=AA=A9?=
 =?UTF-8?q?=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 adm/qa_config.php        | 59 ++++++++++++++++++++++++++++++++++++++++
 adm/qa_config_update.php |  6 ++++
 bbs/qahead.php           | 18 ++++++++++++
 bbs/qalist.php           |  6 ++--
 bbs/qatail.php           | 15 ++++++++++
 bbs/qaview.php           |  6 ++--
 bbs/qawrite.php          |  6 ++--
 install/gnuboard5.sql    |  6 ++++
 8 files changed, 110 insertions(+), 12 deletions(-)
 create mode 100644 bbs/qahead.php
 create mode 100644 bbs/qatail.php

diff --git a/adm/qa_config.php b/adm/qa_config.php
index c33410152..3c7873dcd 100644
--- a/adm/qa_config.php
+++ b/adm/qa_config.php
@@ -1,6 +1,7 @@
 <?php
 $sub_menu = "300500";
 include_once('./_common.php');
+include_once(G5_EDITOR_LIB);
 
 auth_check($auth[$sub_menu], 'r');
 
@@ -31,6 +32,12 @@ if(!sql_query(" DESCRIBE `{$g5['qa_config_table']}` ", false)) {
                   `qa_image_width` int(11) NOT NULL DEFAULT '0',
                   `qa_upload_size` int(11) NOT NULL DEFAULT '0',
                   `qa_insert_content` text NOT NULL,
+                  `qa_include_head` varchar(255) NOT NULL DEFAULT '',
+                  `qa_include_tail` varchar(255) NOT NULL DEFAULT '',
+                  `qa_content_head` text NOT NULL,
+                  `qa_content_tail` text NOT NULL,
+                  `qa_mobile_content_head` text NOT NULL,
+                  `qa_mobile_content_tail` text NOT NULL,
                   `qa_1_subj` varchar(255) NOT NULL DEFAULT '',
                   `qa_2_subj` varchar(255) NOT NULL DEFAULT '',
                   `qa_3_subj` varchar(255) NOT NULL DEFAULT '',
@@ -98,6 +105,17 @@ if(!isset($qaconfig['qa_admin_email'])) {
     sql_query(" ALTER TABLE `{$g5['qa_config_table']}`
                     ADD `qa_admin_email` varchar(255) NOT NULL DEFAULT '' AFTER `qa_admin_hp` ", true);
 }
+
+// 상단 하단 설정 필드 추가
+if(!isset($qaconfig['qa_include_head'])) {
+    sql_query(" ALTER TABLE `{$g5['qa_config_table']}`
+                    ADD `qa_include_head` varchar(255) NOT NULL DEFAULT '' AFTER `qa_insert_content`,
+                    ADD `qa_include_tail` varchar(255) NOT NULL DEFAULT '' AFTER `qa_include_head`,
+                    ADD `qa_content_head` text NOT NULL AFTER `qa_include_tail`,
+                    ADD `qa_content_tail` text NOT NULL AFTER `qa_content_head`,
+                    ADD `qa_mobile_content_head` text NOT NULL AFTER `qa_content_tail`,
+                    ADD `qa_mobile_content_tail` text NOT NULL AFTER `qa_mobile_content_head` ", true);
+}
 ?>
 
 <form name="fqaconfigform" id="fqaconfigform" method="post" onsubmit="return fqaconfigform_submit(this);" autocomplete="off">
@@ -235,6 +253,42 @@ if(!isset($qaconfig['qa_admin_email'])) {
                 업로드 파일 한개당 <input type="text" name="qa_upload_size" value="<?php echo $qaconfig['qa_upload_size'] ?>" id="qa_upload_size" required class="required numeric frm_input"  size="10"> bytes 이하
             </td>
         </tr>
+        <tr>
+            <th scope="row"><label for="qa_include_head">상단 파일 경로</label></th>
+            <td>
+                <input type="text" name="qa_include_head" value="<?php echo $qaconfig['qa_include_head'] ?>" id="qa_include_head" class="frm_input" size="50">
+            </td>
+        </tr>
+        <tr>
+            <th scope="row"><label for="qa_include_tail">하단 파일 경로</label></th>
+            <td>
+                <input type="text" name="qa_include_tail" value="<?php echo $qaconfig['qa_include_tail'] ?>" id="qa_include_tail" class="frm_input" size="50">
+            </td>
+        </tr>
+        <tr>
+            <th scope="row"><label for="qa_content_head">상단 내용</label></th>
+            <td>
+                <?php echo editor_html("qa_content_head", $qaconfig['qa_content_head']); ?>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row"><label for="qa_content_tail">하단 내용</label></th>
+            <td>
+                <?php echo editor_html("qa_content_tail", $qaconfig['qa_content_tail']); ?>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row"><label for="qa_mobile_content_head">모바일 상단 내용</label></th>
+            <td>
+                <?php echo editor_html("qa_mobile_content_head", $qaconfig['qa_mobile_content_head']); ?>
+            </td>
+        </tr>
+        <tr>
+            <th scope="row"><label for="qa_mobile_content_tail">모바일 하단 내용</label></th>
+            <td>
+                <?php echo editor_html("qa_mobile_content_tail", $qaconfig['qa_mobile_content_tail']); ?>
+            </td>
+        </tr>
         <tr>
             <th scope="row"><label for="qa_insert_content">글쓰기 기본 내용</label></th>
             <td>
@@ -266,6 +320,11 @@ if(!isset($qaconfig['qa_admin_email'])) {
 <script>
 function fqaconfigform_submit(f)
 {
+    <?php echo get_editor_js("qa_content_head"); ?>
+    <?php echo get_editor_js("qa_content_tail"); ?>
+    <?php echo get_editor_js("qa_mobile_content_head"); ?>
+    <?php echo get_editor_js("qa_mobile_content_tail"); ?>
+
     f.action = "./qa_config_update.php";
     return true;
 }
diff --git a/adm/qa_config_update.php b/adm/qa_config_update.php
index 7564d68dc..783b35677 100644
--- a/adm/qa_config_update.php
+++ b/adm/qa_config_update.php
@@ -29,6 +29,12 @@ $sql = " update {$g5['qa_config_table']}
                 qa_image_width          = '{$_POST['qa_image_width']}',
                 qa_upload_size          = '{$_POST['qa_upload_size']}',
                 qa_insert_content       = '{$_POST['qa_insert_content']}',
+                qa_include_head         = '{$_POST['qa_include_head']}',
+                qa_include_tail         = '{$_POST['qa_include_tail']}',
+                qa_content_head         = '{$_POST['qa_content_head']}',
+                qa_content_tail         = '{$_POST['qa_content_tail']}',
+                qa_mobile_content_head  = '{$_POST['qa_mobile_content_head']}',
+                qa_mobile_content_tail  = '{$_POST['qa_mobile_content_tail']}',
                 qa_1_subj               = '{$_POST['qa_1_subj']}',
                 qa_2_subj               = '{$_POST['qa_2_subj']}',
                 qa_3_subj               = '{$_POST['qa_3_subj']}',
diff --git a/bbs/qahead.php b/bbs/qahead.php
new file mode 100644
index 000000000..24cf0e564
--- /dev/null
+++ b/bbs/qahead.php
@@ -0,0 +1,18 @@
+<?php
+if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
+
+$qa_skin_path = (G5_IS_MOBILE ? G5_MOBILE_PATH : G5_PATH).'/'.G5_SKIN_DIR.'/qa/'.$qaconfig['qa_skin'];
+$qa_skin_url = (G5_IS_MOBILE ? G5_MOBILE_URL : G5_URL).'/'.G5_SKIN_DIR.'/qa/'.$qaconfig['qa_skin'];
+
+if (G5_IS_MOBILE) {
+    // 모바일의 경우 설정을 따르지 않는다.
+    include_once('./_head.php');
+    echo stripslashes($qaconfig['qa_mobile_content_head']);
+} else {
+    if($qaconfig['qa_include_head'])
+        @include ($qaconfig['qa_include_head']);
+    else
+        include ('./_head.php');
+    echo stripslashes($qaconfig['qa_content_head']);
+}
+?>
\ No newline at end of file
diff --git a/bbs/qalist.php b/bbs/qalist.php
index 6acc1b11f..577d1f8f7 100644
--- a/bbs/qalist.php
+++ b/bbs/qalist.php
@@ -7,10 +7,8 @@ if($is_guest)
 $qaconfig = get_qa_config();
 
 $g5['title'] = $qaconfig['qa_title'];
-include_once('./_head.php');
+include_once('./qahead.php');
 
-$qa_skin_path = (G5_IS_MOBILE ? G5_MOBILE_PATH : G5_PATH).'/'.G5_SKIN_DIR.'/qa/'.$qaconfig['qa_skin'];
-$qa_skin_url = (G5_IS_MOBILE ? G5_MOBILE_URL : G5_URL).'/'.G5_SKIN_DIR.'/qa/'.$qaconfig['qa_skin'];
 $skin_file = $qa_skin_path.'/list.skin.php';
 
 $category_option = '';
@@ -120,5 +118,5 @@ if(is_file($skin_file)) {
     echo '<div>'.str_replace(G5_PATH.'/', '', $skin_file).'이 존재하지 않습니다.</div>';
 }
 
-include_once('./_tail.php');
+include_once('./qatail.php');
 ?>
\ No newline at end of file
diff --git a/bbs/qatail.php b/bbs/qatail.php
new file mode 100644
index 000000000..633267c98
--- /dev/null
+++ b/bbs/qatail.php
@@ -0,0 +1,15 @@
+<?php
+if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
+
+if (G5_IS_MOBILE) {
+    echo stripslashes($qaconfig['qa_mobile_content_tail']);
+    // 모바일의 경우 설정을 따르지 않는다.
+    include_once('./_tail.php');
+} else {
+    echo stripslashes($qaconfig['qa_mobile_content_tail']);
+    if($qaconfig['qa_include_tail'])
+        @include ($board['bo_include_tail']);
+    else
+        include ('./_tail.php');
+}
+?>
\ No newline at end of file
diff --git a/bbs/qaview.php b/bbs/qaview.php
index 3aeeb7606..51e296e52 100644
--- a/bbs/qaview.php
+++ b/bbs/qaview.php
@@ -8,10 +8,8 @@ if($is_guest)
 $qaconfig = get_qa_config();
 
 $g5['title'] = $qaconfig['qa_title'];
-include_once('./_head.php');
+include_once('./qahead.php');
 
-$qa_skin_path = (G5_IS_MOBILE ? G5_MOBILE_PATH : G5_PATH).'/'.G5_SKIN_DIR.'/qa/'.$qaconfig['qa_skin'];
-$qa_skin_url = (G5_IS_MOBILE ? G5_MOBILE_URL : G5_URL).'/'.G5_SKIN_DIR.'/qa/'.$qaconfig['qa_skin'];
 $skin_file = $qa_skin_path.'/view.skin.php';
 
 if(is_file($skin_file)) {
@@ -173,5 +171,5 @@ if(is_file($skin_file)) {
     echo '<div>'.str_replace(G5_PATH.'/', '', $skin_file).'이 존재하지 않습니다.</div>';
 }
 
-include_once('./_tail.php');
+include_once('./qatail.php');
 ?>
\ No newline at end of file
diff --git a/bbs/qawrite.php b/bbs/qawrite.php
index 252e8606e..8be900081 100644
--- a/bbs/qawrite.php
+++ b/bbs/qawrite.php
@@ -12,10 +12,8 @@ if($is_guest)
 $qaconfig = get_qa_config();
 
 $g5['title'] = $qaconfig['qa_title'];
-include_once('./_head.php');
+include_once('./qahead.php');
 
-$qa_skin_path = (G5_IS_MOBILE ? G5_MOBILE_PATH : G5_PATH).'/'.G5_SKIN_DIR.'/qa/'.$qaconfig['qa_skin'];
-$qa_skin_url = (G5_IS_MOBILE ? G5_MOBILE_URL : G5_URL).'/'.G5_SKIN_DIR.'/qa/'.$qaconfig['qa_skin'];
 $skin_file = $qa_skin_path.'/write.skin.php';
 
 if(is_file($skin_file)) {
@@ -137,5 +135,5 @@ if(is_file($skin_file)) {
     echo '<div>'.str_replace(G5_PATH.'/', '', $skin_file).'이 존재하지 않습니다.</div>';
 }
 
-include_once('./_tail.php');
+include_once('./qatail.php');
 ?>
\ No newline at end of file
diff --git a/install/gnuboard5.sql b/install/gnuboard5.sql
index e246d27ce..4d80e68ad 100644
--- a/install/gnuboard5.sql
+++ b/install/gnuboard5.sql
@@ -732,6 +732,12 @@ CREATE TABLE IF NOT EXISTS `g5_qa_config` (
   `qa_image_width` int(11) NOT NULL DEFAULT '0',
   `qa_upload_size` int(11) NOT NULL DEFAULT '0',
   `qa_insert_content` text NOT NULL,
+  `qa_include_head` varchar(255) NOT NULL DEFAULT '',
+  `qa_include_tail` varchar(255) NOT NULL DEFAULT '',
+  `qa_content_head` text NOT NULL,
+  `qa_content_tail` text NOT NULL,
+  `qa_mobile_content_head` text NOT NULL,
+  `qa_mobile_content_tail` text NOT NULL,
   `qa_1_subj` varchar(255) NOT NULL DEFAULT '',
   `qa_2_subj` varchar(255) NOT NULL DEFAULT '',
   `qa_3_subj` varchar(255) NOT NULL DEFAULT '',

From 8a81b42e0c8fd6cc9cbed81e6be13102807228aa Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Wed, 12 Mar 2014 11:58:04 +0900
Subject: [PATCH 2/8] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=ED=8C=90=20=ED=95=98?=
 =?UTF-8?q?=EB=8B=A8=20=ED=8C=8C=EC=9D=BC=20=EC=B6=9C=EB=A0=A5=20=EB=B6=80?=
 =?UTF-8?q?=EB=B6=84=20=EC=A1=B0=EA=B1=B4=EB=AC=B8=20=EC=B2=98=EB=A6=AC=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bbs/board_tail.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/bbs/board_tail.php b/bbs/board_tail.php
index c6bd1e286..408d56625 100644
--- a/bbs/board_tail.php
+++ b/bbs/board_tail.php
@@ -6,7 +6,7 @@ if (G5_IS_MOBILE) {
     echo stripslashes($board['bo_mobile_content_tail']);
     // 모바일의 경우 설정을 따르지 않는다.
     include_once('./_tail.php');
-} else if ($board['bo_include_tail']) {
+} else {
     echo stripslashes($board['bo_content_tail']);
     @include ($board['bo_include_tail']);
 }

From db07567e64467570f42aabd8c928aee11f42e7ee Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Wed, 12 Mar 2014 13:17:50 +0900
Subject: [PATCH 3/8] =?UTF-8?q?=ED=8F=AC=EC=9D=B8=ED=8A=B8=20=EB=A6=AC?=
 =?UTF-8?q?=EC=8A=A4=ED=8A=B8=20=EC=8A=A4=ED=82=A8=ED=99=94?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 bbs/point.php                           | 88 +------------------------
 mobile/skin/member/basic/point.skin.php | 88 +++++++++++++++++++++++++
 skin/member/basic/point.skin.php        | 88 +++++++++++++++++++++++++
 3 files changed, 179 insertions(+), 85 deletions(-)
 create mode 100644 mobile/skin/member/basic/point.skin.php
 create mode 100644 skin/member/basic/point.skin.php

diff --git a/bbs/point.php b/bbs/point.php
index f0549bb14..d9adee088 100644
--- a/bbs/point.php
+++ b/bbs/point.php
@@ -9,7 +9,7 @@ include_once(G5_PATH.'/head.sub.php');
 
 $list = array();
 
-$sql_common = " from {$g5['point_table']} where mb_id = '".mysql_escape_string($member['mb_id'])."' ";
+$sql_common = " from {$g5['point_table']} where mb_id = '".escape_trim($member['mb_id'])."' ";
 $sql_order = " order by po_id desc ";
 
 $sql = " select count(*) as cnt {$sql_common} ";
@@ -18,92 +18,10 @@ $total_count = $row['cnt'];
 
 $rows = $config['cf_page_rows'];
 $total_page  = ceil($total_count / $rows);  // 전체 페이지 계산
-if (!$page) { $page = 1; } // 페이지가 없으면 첫 페이지 (1 페이지)
+if ($page < 1) { $page = 1; } // 페이지가 없으면 첫 페이지 (1 페이지)
 $from_record = ($page - 1) * $rows; // 시작 열을 구함
-?>
 
-<div id="point" class="new_win">
-    <h1 id="win_title"><?php echo $g5['title'] ?></h1>
+include_once($member_skin_path.'/point.skin.php');
 
-    <div class="tbl_head01 tbl_wrap">
-        <table>
-        <caption>포인트 사용내역 목록</caption>
-        <thead>
-        <tr>
-            <th scope="col">일시</th>
-            <th scope="col">내용</th>
-            <th scope="col">만료일</th>
-            <th scope="col">지급포인트</th>
-            <th scope="col">사용포인트</th>
-        </tr>
-        </thead>
-        <tbody>
-        <?php
-        $sum_point1 = $sum_point2 = $sum_point3 = 0;
-
-        $sql = " select *
-                    {$sql_common}
-                    {$sql_order}
-                    limit {$from_record}, {$rows} ";
-        $result = sql_query($sql);
-        for ($i=0; $row=sql_fetch_array($result); $i++) {
-            $point1 = $point2 = 0;
-            if ($row['po_point'] > 0) {
-                $point1 = '+' .number_format($row['po_point']);
-                $sum_point1 += $row['po_point'];
-            } else {
-                $point2 = number_format($row['po_point']);
-                $sum_point2 += $row['po_point'];
-            }
-
-            $po_content = $row['po_content'];
-
-            $expr = '';
-            if($row['po_expired'] == 1)
-                $expr = ' txt_expired';
-        ?>
-        <tr>
-            <td class="td_datetime"><?php echo $row['po_datetime']; ?></td>
-            <td><?php echo $po_content; ?></td>
-            <td class="td_date<?php echo $expr; ?>">
-                <?php if ($row['po_expired'] == 1) { ?>
-                만료<?php echo substr(str_replace('-', '', $row['po_expire_date']), 2); ?>
-                <?php } else echo $row['po_expire_date'] == '9999-12-31' ? '&nbsp;' : $row['po_expire_date']; ?>
-            </td>
-            <td class="td_numbig"><?php echo $point1; ?></td>
-            <td class="td_numbig"><?php echo $point2; ?></td>
-        </tr>
-        <?php
-        }
-
-        if ($i == 0)
-            echo '<tr><td colspan="5" class="empty_table">자료가 없습니다.</td></tr>';
-        else {
-            if ($sum_point1 > 0)
-                $sum_point1 = "+" . number_format($sum_point1);
-            $sum_point2 = number_format($sum_point2);
-        }
-        ?>
-        </tbody>
-        <tfoot>
-        <tr>
-            <th scope="row" colspan="3">소계</th>
-            <td><?php echo $sum_point1; ?></td>
-            <td><?php echo $sum_point2; ?></td>
-        </tr>
-        <tr>
-            <th scope="row" colspan="3">보유포인트</th>
-            <td colspan="2"><?php echo number_format($member['mb_point']); ?></td>
-        </tr>
-        </tfoot>
-        </table>
-    </div>
-
-    <?php echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, $_SERVER['PHP_SELF'].'?'.$qstr.'&amp;page='); ?>
-
-    <div class="win_btn"><button type="button" onclick="javascript:window.close();">창닫기</button></div>
-</div>
-
-<?php
 include_once(G5_PATH.'/tail.sub.php');
 ?>
\ No newline at end of file
diff --git a/mobile/skin/member/basic/point.skin.php b/mobile/skin/member/basic/point.skin.php
new file mode 100644
index 000000000..4e108db80
--- /dev/null
+++ b/mobile/skin/member/basic/point.skin.php
@@ -0,0 +1,88 @@
+<?php
+if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
+
+// add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
+add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">', 0);
+?>
+
+<div id="point" class="new_win">
+    <h1 id="win_title"><?php echo $g5['title'] ?></h1>
+
+    <div class="tbl_head01 tbl_wrap">
+        <table>
+        <caption>포인트 사용내역 목록</caption>
+        <thead>
+        <tr>
+            <th scope="col">일시</th>
+            <th scope="col">내용</th>
+            <th scope="col">만료일</th>
+            <th scope="col">지급포인트</th>
+            <th scope="col">사용포인트</th>
+        </tr>
+        </thead>
+        <tbody>
+        <?php
+        $sum_point1 = $sum_point2 = $sum_point3 = 0;
+
+        $sql = " select *
+                    {$sql_common}
+                    {$sql_order}
+                    limit {$from_record}, {$rows} ";
+        $result = sql_query($sql);
+        for ($i=0; $row=sql_fetch_array($result); $i++) {
+            $point1 = $point2 = 0;
+            if ($row['po_point'] > 0) {
+                $point1 = '+' .number_format($row['po_point']);
+                $sum_point1 += $row['po_point'];
+            } else {
+                $point2 = number_format($row['po_point']);
+                $sum_point2 += $row['po_point'];
+            }
+
+            $po_content = $row['po_content'];
+
+            $expr = '';
+            if($row['po_expired'] == 1)
+                $expr = ' txt_expired';
+        ?>
+        <tr>
+            <td class="td_datetime"><?php echo $row['po_datetime']; ?></td>
+            <td><?php echo $po_content; ?></td>
+            <td class="td_date<?php echo $expr; ?>">
+                <?php if ($row['po_expired'] == 1) { ?>
+                만료<?php echo substr(str_replace('-', '', $row['po_expire_date']), 2); ?>
+                <?php } else echo $row['po_expire_date'] == '9999-12-31' ? '&nbsp;' : $row['po_expire_date']; ?>
+            </td>
+            <td class="td_numbig"><?php echo $point1; ?></td>
+            <td class="td_numbig"><?php echo $point2; ?></td>
+        </tr>
+        <?php
+        }
+
+        if ($i == 0)
+            echo '<tr><td colspan="5" class="empty_table">자료가 없습니다.</td></tr>';
+        else {
+            if ($sum_point1 > 0)
+                $sum_point1 = "+" . number_format($sum_point1);
+            $sum_point2 = number_format($sum_point2);
+        }
+        ?>
+        </tbody>
+        <tfoot>
+        <tr>
+            <th scope="row" colspan="3">소계</th>
+            <td><?php echo $sum_point1; ?></td>
+            <td><?php echo $sum_point2; ?></td>
+        </tr>
+        <tr>
+            <th scope="row" colspan="3">보유포인트</th>
+            <td colspan="2"><?php echo number_format($member['mb_point']); ?></td>
+        </tr>
+        </tfoot>
+        </table>
+    </div>
+
+    <?php echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, $_SERVER['PHP_SELF'].'?'.$qstr.'&amp;page='); ?>
+
+    <div class="win_btn"><button type="button" onclick="javascript:window.close();">창닫기</button></div>
+</div>
\ No newline at end of file
diff --git a/skin/member/basic/point.skin.php b/skin/member/basic/point.skin.php
new file mode 100644
index 000000000..4e108db80
--- /dev/null
+++ b/skin/member/basic/point.skin.php
@@ -0,0 +1,88 @@
+<?php
+if (!defined('_GNUBOARD_')) exit; // 개별 페이지 접근 불가
+
+// add_stylesheet('css 구문', 출력순서); 숫자가 작을 수록 먼저 출력됨
+add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">', 0);
+?>
+
+<div id="point" class="new_win">
+    <h1 id="win_title"><?php echo $g5['title'] ?></h1>
+
+    <div class="tbl_head01 tbl_wrap">
+        <table>
+        <caption>포인트 사용내역 목록</caption>
+        <thead>
+        <tr>
+            <th scope="col">일시</th>
+            <th scope="col">내용</th>
+            <th scope="col">만료일</th>
+            <th scope="col">지급포인트</th>
+            <th scope="col">사용포인트</th>
+        </tr>
+        </thead>
+        <tbody>
+        <?php
+        $sum_point1 = $sum_point2 = $sum_point3 = 0;
+
+        $sql = " select *
+                    {$sql_common}
+                    {$sql_order}
+                    limit {$from_record}, {$rows} ";
+        $result = sql_query($sql);
+        for ($i=0; $row=sql_fetch_array($result); $i++) {
+            $point1 = $point2 = 0;
+            if ($row['po_point'] > 0) {
+                $point1 = '+' .number_format($row['po_point']);
+                $sum_point1 += $row['po_point'];
+            } else {
+                $point2 = number_format($row['po_point']);
+                $sum_point2 += $row['po_point'];
+            }
+
+            $po_content = $row['po_content'];
+
+            $expr = '';
+            if($row['po_expired'] == 1)
+                $expr = ' txt_expired';
+        ?>
+        <tr>
+            <td class="td_datetime"><?php echo $row['po_datetime']; ?></td>
+            <td><?php echo $po_content; ?></td>
+            <td class="td_date<?php echo $expr; ?>">
+                <?php if ($row['po_expired'] == 1) { ?>
+                만료<?php echo substr(str_replace('-', '', $row['po_expire_date']), 2); ?>
+                <?php } else echo $row['po_expire_date'] == '9999-12-31' ? '&nbsp;' : $row['po_expire_date']; ?>
+            </td>
+            <td class="td_numbig"><?php echo $point1; ?></td>
+            <td class="td_numbig"><?php echo $point2; ?></td>
+        </tr>
+        <?php
+        }
+
+        if ($i == 0)
+            echo '<tr><td colspan="5" class="empty_table">자료가 없습니다.</td></tr>';
+        else {
+            if ($sum_point1 > 0)
+                $sum_point1 = "+" . number_format($sum_point1);
+            $sum_point2 = number_format($sum_point2);
+        }
+        ?>
+        </tbody>
+        <tfoot>
+        <tr>
+            <th scope="row" colspan="3">소계</th>
+            <td><?php echo $sum_point1; ?></td>
+            <td><?php echo $sum_point2; ?></td>
+        </tr>
+        <tr>
+            <th scope="row" colspan="3">보유포인트</th>
+            <td colspan="2"><?php echo number_format($member['mb_point']); ?></td>
+        </tr>
+        </tfoot>
+        </table>
+    </div>
+
+    <?php echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, $_SERVER['PHP_SELF'].'?'.$qstr.'&amp;page='); ?>
+
+    <div class="win_btn"><button type="button" onclick="javascript:window.close();">창닫기</button></div>
+</div>
\ No newline at end of file

From f368d7cb9d681adc8b83872c391c743087dc4417 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Wed, 12 Mar 2014 15:04:26 +0900
Subject: [PATCH 4/8] =?UTF-8?q?get=5Fpaging=20=ED=95=A8=EC=88=98=20?=
 =?UTF-8?q?=EC=A3=BC=EC=84=9D=EB=AC=B8=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/common.lib.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/lib/common.lib.php b/lib/common.lib.php
index a7011c249..ec8f6a05f 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -33,7 +33,7 @@ function get_microtime()
 }
 
 
-// 현재페이지, 총페이지수, 한페이지에 보여줄 행, URL
+// 한페이지에 보여줄 행, 현재페이지, 총페이지수, URL
 function get_paging($write_pages, $cur_page, $total_page, $url, $add="")
 {
     $url = preg_replace('#&amp;page=[0-9]*(&amp;page=)$#', '$1', $url);

From 343de88d627696820977022d416293e0c4c14281 Mon Sep 17 00:00:00 2001
From: chicpro <chicpro@gmail.com>
Date: Wed, 12 Mar 2014 16:55:01 +0900
Subject: [PATCH 5/8] =?UTF-8?q?=EB=82=A0=EC=A7=9C=ED=98=95=EC=8B=9D=20?=
 =?UTF-8?q?=EB=B3=80=ED=99=98=20=ED=95=A8=EC=88=98=20=EC=B6=94=EA=B0=80?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 lib/common.lib.php | 11 +++++++++++
 1 file changed, 11 insertions(+)

diff --git a/lib/common.lib.php b/lib/common.lib.php
index ec8f6a05f..4b8e0d4cc 100644
--- a/lib/common.lib.php
+++ b/lib/common.lib.php
@@ -2604,4 +2604,15 @@ function htmlspecialchars2($str)
     $str = strtr($str, $trans);
     return $str;
 }
+
+// date 형식 변환
+function conv_date_format($format, $date, $add='')
+{
+    if($add)
+        $timestamp = strtotime($add, strtotime($date));
+    else
+        $timestamp = strtotime($date);
+
+    return date($format, $timestamp);
+}
 ?>
\ No newline at end of file

From c37c1fbb2c57ca60d52cc7742bb3512b3273651c Mon Sep 17 00:00:00 2001
From: whitedot <whitedot@naver.com>
Date: Wed, 12 Mar 2014 17:18:30 +0900
Subject: [PATCH 6/8] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90:=20gnb=20hover?=
 =?UTF-8?q?=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=EB=B3=B5=EC=9B=90?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 css/admin.css | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/css/admin.css b/css/admin.css
index 5357391af..6f761cd52 100644
--- a/css/admin.css
+++ b/css/admin.css
@@ -56,7 +56,7 @@ h2.h2_frm {padding-top:15px}
 .gnb_2dul {display:none;position:absolute;top:34px;width:181px;border:1px solid #999;border-top:0;background:#fff}
 .gnb_2dli {float:left}
 .gnb_2dli a {display:inline-block;float:none;padding:8px 10px;width:161px;height:auto;background:#fff;color:#000;font-weight:normal;text-align:left;line-height:1em}
-.gnb_2dli a:focus, .gnb_js .gnb_2dli a:hover {background:#484848;color:#fff}
+.gnb_2dli a:focus, .gnb_2dli a:hover {background:#484848 !important;color:#fff}
 .gnb_1dli_over .gnb_2dul {display:block;left:-1px}
 .gnb_1dli_over2 .gnb_2dul {display:block;right:-1px}
 

From 463d81a27cc7100e07db502570e1c7088a614757 Mon Sep 17 00:00:00 2001
From: whitedot <whitedot@naver.com>
Date: Wed, 12 Mar 2014 17:35:11 +0900
Subject: [PATCH 7/8] =?UTF-8?q?=EA=B3=B5=ED=86=B5:=20#28=20=ED=8F=AC?=
 =?UTF-8?q?=EC=9D=B8=ED=8A=B8=20=ED=8E=98=EC=9D=B4=EC=A7=80=20=EC=8A=A4?=
 =?UTF-8?q?=ED=82=A8=ED=99=94,=20=EC=8A=A4=ED=81=AC=EB=9E=A9/=EC=AA=BD?=
 =?UTF-8?q?=EC=A7=80=20=EB=AA=A9=EB=A1=9D=20=EC=8A=A4=ED=83=80=EC=9D=BC?=
 =?UTF-8?q?=EB=8F=84=20=ED=95=A8=EA=BB=98=20=EC=88=98=EC=A0=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 css/mobile.css                              |  2 +-
 mobile/skin/member/basic/memo.skin.php      | 39 +++++-------
 mobile/skin/member/basic/memo_view.skin.php | 10 ++-
 mobile/skin/member/basic/point.skin.php     | 69 +++++++++------------
 mobile/skin/member/basic/scrap.skin.php     | 29 +++------
 mobile/skin/member/basic/style.css          | 32 ++++++++--
 skin/member/basic/memo.skin.php             |  4 +-
 skin/member/basic/style.css                 |  4 +-
 8 files changed, 93 insertions(+), 96 deletions(-)

diff --git a/css/mobile.css b/css/mobile.css
index 30045c4de..000706b94 100644
--- a/css/mobile.css
+++ b/css/mobile.css
@@ -112,7 +112,7 @@ a:hover, a:focus, a:active {color:#000;text-decoration:underline}
 #captcha audio {display:block;margin:0 0 5px;width:187px}
 #captcha #captcha_img {width:60px;height:30px;border:1px solid #e9e9e9}
 #captcha #captcha_reload {margin:0;padding:0 5px;height:32px;border:0;background:#e4eaec;vertical-align:middle;overflow:hidden;cursor:pointer}
-#captcha #captcha_key {margin:0 0 0 4px;padding:0 5px;width:50px;height:30px;border:1px solid #b8c9c2;background:#f7f7f7;font-size:1.333em;font-weight:bold;text-align:center;line-height:2.8em}
+#captcha #captcha_key {margin:0 0 0 4px;padding:0 5px;width:50px;height:30px;border:1px solid #b8c9c2;background:#f7f7f7;font-size:1.333em;font-weight:bold;text-align:center;line-height:2em}
 #captcha #captcha_info {display:block;margin:5px 0 0;font-size:0.95em;letter-spacing:-0.1em}
 
 /* 버튼 */
diff --git a/mobile/skin/member/basic/memo.skin.php b/mobile/skin/member/basic/memo.skin.php
index f6cbbb7af..2d2174b1c 100644
--- a/mobile/skin/member/basic/memo.skin.php
+++ b/mobile/skin/member/basic/memo.skin.php
@@ -14,33 +14,22 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
         <li><a href="./memo_form.php">쪽지쓰기</a></li>
     </ul>
 
-    <div class="tbl_head01 tbl_wrap">
-        <table>
-        <caption>
-            전체 <?php echo $kind_title ?>쪽지 <?php echo $total_count ?>통<br>
-        </caption>
-        <thead>
-        <tr>
-            <th scope="col"><?php echo  ($kind == "recv") ? "보낸사람" : "받는사람"; ?></th>
-            <th scope="col">보낸시간</th>
-            <th scope="col">읽은시간</th>
-            <th scope="col">관리</th>
-        </tr>
-        </thead>
-        <tbody>
-        <?php for ($i=0; $i<count($list); $i++) { ?>
-        <tr>
-            <td><?php echo $list[$i]['name'] ?></td>
-            <td class="td_datetime"><a href="<?php echo $list[$i]['view_href'] ?>"><?php echo $list[$i]['send_datetime'] ?></font></td>
-            <td class="td_datetime"><a href="<?php echo $list[$i]['view_href'] ?>"><?php echo $list[$i]['read_datetime'] ?></font></td>
-            <td class="td_mng"><a href="<?php echo $list[$i]['del_href'] ?>" onclick="del(this.href); return false;">삭제</a></td>
-        </tr>
-        <?php } ?>
-        <?php if ($i==0) { echo "<tr><td colspan=\"4\" class=\"empty_table\">자료가 없습니다.</td></tr>"; } ?>
-        </tbody>
-        </table>
+    <div class="win_desc">
+        전체 <?php echo $kind_title ?>쪽지 <?php echo $total_count ?>통<br>
     </div>
 
+    <ul id="memo_list_ul">
+        <?php for ($i=0; $i<count($list); $i++) { ?>
+        <li>
+            <a href="<?php echo $list[$i]['view_href'] ?>" class="memo_link"><?php echo $list[$i]['send_datetime'] ?> 에 받은 쪽지</a>
+            <span class="memo_read"><?php echo $list[$i]['read_datetime'] ?></span>
+            <span class="memo_send"><?php echo $list[$i]['name'] ?></span>
+            <a href="<?php echo $list[$i]['del_href'] ?>" onclick="del(this.href); return false;" class="memo_del">삭제</a>
+        </li>
+        <?php } ?>
+        <?php if ($i==0) { echo "<li class=\"empty_list\">자료가 없습니다.</li>"; } ?>
+    </ul>
+
     <p class="win_desc">
         쪽지 보관일수는 최장 <strong><?php echo $config['cf_memo_del'] ?></strong>일 입니다.
     </p>
diff --git a/mobile/skin/member/basic/memo_view.skin.php b/mobile/skin/member/basic/memo_view.skin.php
index 13e7bc542..ae87bfacf 100644
--- a/mobile/skin/member/basic/memo_view.skin.php
+++ b/mobile/skin/member/basic/memo_view.skin.php
@@ -22,8 +22,11 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
         <li><a href="./memo.php?kind=send">보낸쪽지</a></li>
         <li><a href="./memo_form.php">쪽지쓰기</a></li>
     </ul>
-    <section>
-        <h2>쪽지 내용</h2>
+
+    <article id="memo_view_contents">
+        <header>
+            <h1>쪽지 내용</h1>
+        </header>
         <ul id="memo_view_ul">
             <li class="memo_view_li">
                 <span class="memo_view_subj"><?php echo $kind_str ?>사람</span>
@@ -37,7 +40,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
         <p>
             <?php echo conv_content($memo['me_memo'], 0) ?>
         </p>
-    </section>
+    </article>
+
     <div class="win_btn">
         <?php if($prev_link) { ?>
         <a href="<?php echo $prev_link ?>">이전쪽지</a>
diff --git a/mobile/skin/member/basic/point.skin.php b/mobile/skin/member/basic/point.skin.php
index 4e108db80..27e146bb6 100644
--- a/mobile/skin/member/basic/point.skin.php
+++ b/mobile/skin/member/basic/point.skin.php
@@ -8,19 +8,7 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
 <div id="point" class="new_win">
     <h1 id="win_title"><?php echo $g5['title'] ?></h1>
 
-    <div class="tbl_head01 tbl_wrap">
-        <table>
-        <caption>포인트 사용내역 목록</caption>
-        <thead>
-        <tr>
-            <th scope="col">일시</th>
-            <th scope="col">내용</th>
-            <th scope="col">만료일</th>
-            <th scope="col">지급포인트</th>
-            <th scope="col">사용포인트</th>
-        </tr>
-        </thead>
-        <tbody>
+    <ul id="point_ul">
         <?php
         $sum_point1 = $sum_point2 = $sum_point3 = 0;
 
@@ -45,41 +33,46 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
             if($row['po_expired'] == 1)
                 $expr = ' txt_expired';
         ?>
-        <tr>
-            <td class="td_datetime"><?php echo $row['po_datetime']; ?></td>
-            <td><?php echo $po_content; ?></td>
-            <td class="td_date<?php echo $expr; ?>">
-                <?php if ($row['po_expired'] == 1) { ?>
-                만료<?php echo substr(str_replace('-', '', $row['po_expire_date']), 2); ?>
-                <?php } else echo $row['po_expire_date'] == '9999-12-31' ? '&nbsp;' : $row['po_expire_date']; ?>
-            </td>
-            <td class="td_numbig"><?php echo $point1; ?></td>
-            <td class="td_numbig"><?php echo $point2; ?></td>
-        </tr>
+        <li>
+            <div class="point_wrap01">
+                <span class="point_date"><?php echo $row['po_datetime']; ?></span>
+                <span class="point_log"><?php echo $po_content; ?></span>
+            </div>
+            <div class="point_wrap02">
+                <span class="point_expdate<?php echo $expr; ?>">
+                    <?php if ($row['po_expired'] == 1) { ?>
+                    만료<?php echo substr(str_replace('-', '', $row['po_expire_date']), 2); ?>
+                    <?php } else echo $row['po_expire_date'] == '9999-12-31' ? '&nbsp;' : $row['po_expire_date']; ?>
+                </span>
+                <span class="point_inout"><?php if ($point1) echo $point1; else echo $point2; ?></span>
+            </div>
+        </li>
         <?php
         }
 
         if ($i == 0)
-            echo '<tr><td colspan="5" class="empty_table">자료가 없습니다.</td></tr>';
+            echo '<li class="empty_list">자료가 없습니다.</li>';
         else {
             if ($sum_point1 > 0)
                 $sum_point1 = "+" . number_format($sum_point1);
             $sum_point2 = number_format($sum_point2);
         }
         ?>
-        </tbody>
-        <tfoot>
-        <tr>
-            <th scope="row" colspan="3">소계</th>
-            <td><?php echo $sum_point1; ?></td>
-            <td><?php echo $sum_point2; ?></td>
-        </tr>
-        <tr>
-            <th scope="row" colspan="3">보유포인트</th>
-            <td colspan="2"><?php echo number_format($member['mb_point']); ?></td>
-        </tr>
-        </tfoot>
-        </table>
+    </ul>
+
+    <div id="point_sum">
+        <div class="sum_row">
+            <span class="sum_tit">지급</span>
+            <b class="sum_val"><?php echo $sum_point1; ?></b>
+        </div>
+        <div class="sum_row">
+            <span class="sum_tit">사용</span>
+            <b class="sum_val"><?php echo $sum_point2; ?></b>
+        </div>
+        <div class="sum_row">
+            <span class="sum_tit">보유</span>
+            <b class="sum_val"><?php echo number_format($member['mb_point']); ?></b>
+        </div>
     </div>
 
     <?php echo get_paging(G5_IS_MOBILE ? $config['cf_mobile_pages'] : $config['cf_write_pages'], $page, $total_page, $_SERVER['PHP_SELF'].'?'.$qstr.'&amp;page='); ?>
diff --git a/mobile/skin/member/basic/scrap.skin.php b/mobile/skin/member/basic/scrap.skin.php
index c47e3cd80..ccb43bac5 100644
--- a/mobile/skin/member/basic/scrap.skin.php
+++ b/mobile/skin/member/basic/scrap.skin.php
@@ -8,29 +8,16 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
 <div id="scrap" class="new_win mbskin">
     <h1 id="win_title"><?php echo $g5['title'] ?></h1>
 
-    <div class="tbl_head01 tbl_wrap">
-        <table>
-        <caption>스크랩 목록</caption>
-        <thead>
-        <tr>
-            <th scope="col">게시판</th>
-            <th scope="col">제목</th>
-            <th scope="col">삭제</th>
-        </tr>
-        </thead>
-        <tbody>
+    <ul id="scrap_ul">
         <?php for ($i=0; $i<count($list); $i++) { ?>
-        <tr>
-            <td class="td_board"><a href="<?php echo $list[$i]['opener_href'] ?>" target="_blank" onclick="opener.document.location.href='<?php echo $list[$i]['opener_href'] ?>'; return false;"><?php echo $list[$i]['bo_subject'] ?></a></td>
-            <td><a href="<?php echo $list[$i]['opener_href_wr_id'] ?>" target="_blank" onclick="opener.document.location.href='<?php echo $list[$i]['opener_href_wr_id'] ?>'; return false;"><?php echo $list[$i]['subject'] ?></a></td>
-            <td class="td_mng"><a href="<?php echo $list[$i]['del_href']; ?>" onclick="del(this.href); return false;">삭제</a></td>
-        </tr>
+        <li>
+            <a href="<?php echo $list[$i]['opener_href'] ?>" target="_blank" class="scrap_board" onclick="opener.document.location.href='<?php echo $list[$i]['opener_href'] ?>'; return false;"><?php echo $list[$i]['bo_subject'] ?></a>
+            <a href="<?php echo $list[$i]['opener_href_wr_id'] ?>" target="_blank" class="scrap_link" onclick="opener.document.location.href='<?php echo $list[$i]['opener_href_wr_id'] ?>'; return false;"><?php echo $list[$i]['subject'] ?></a>
+            <a href="<?php echo $list[$i]['del_href']; ?>" class="scrap_del" onclick="del(this.href); return false;">삭제</a>
+        </li>
         <?php } ?>
-
-        <?php if ($i == 0) echo "<tr><td colspan=\"5\" class=\"empty_table\">자료가 없습니다.</td></tr>"; ?>
-        </tbody>
-        </table>
-    </div>
+        <?php if ($i == 0) echo "<li class=\"empty_list\">자료가 없습니다.</li>"; ?>
+    </ul>
 
     <?php echo get_paging($config['cf_mobile_pages'], $page, $total_page, "?$qstr&amp;page="); ?>
 
diff --git a/mobile/skin/member/basic/style.css b/mobile/skin/member/basic/style.css
index a0894c62e..5c27f4ffb 100644
--- a/mobile/skin/member/basic/style.css
+++ b/mobile/skin/member/basic/style.css
@@ -121,24 +121,46 @@
 #mb_login section div {text-align:right}
 
 /* 쪽지 */
-#memo_view section {padding:10px}
-#memo_view section h2 {width:0;height:0;font-size:0;line-height:0;overflow:hidden}
+#memo_view_contents {margin:0 auto 20px;width:90%}
+#memo_view_contents h1 {position:absolute;font-size:0;line-height:0;overflow:hidden}
 #memo_view_ul {margin:0;padding:0 0 10px;border-bottom:1px solid #eee;list-style:none}
 .memo_view_li {position:relative;padding:5px 0}
 .memo_view_subj {display:inline-block;width:65px}
 #memo_view_ul a {}
-#memo_view section p {min-height:150px;height:auto !important;height:150px}
+#memo_view p {padding:10px 0;min-height:150px;height:auto !important;height:150px;line-height:1.8em}
+
+#memo_list_ul {margin:0 20px;padding:0;border-top:1px solid #e9e9e9;list-style:none}
+#memo_list_ul li {position:relative;padding:10px 0;border-bottom:1px solid #e9e9e9}
+#memo_list_ul .memo_link {}
+#memo_list_ul .memo_send {position:absolute;top:10px;right:30px}
+#memo_list_ul .memo_read {font-size:0.95em;color:#666}
+#memo_list_ul .memo_del {position:absolute;top:10px;right:0}
 
 #memo_write #me_recv_mb_id {width:98%}
 #memo_write textarea {width:99%;height:100px}
 
 /* 스크랩 */
-#scrap td:nth-of-type(1) {width:150px}
-#scrap td:nth-last-of-type(1) {width:50px;text-align:center}
+#scrap_ul {margin:0 20px;padding:0;border-top:1px solid #e9e9e9;list-style:none}
+#scrap_ul li {position:relative;padding:10px 35px 10px 0;border-bottom:1px solid #e9e9e9}
+#scrap_ul .scrap_board {display:inline-block;margin:0 10px 0 0;font-weight:bold}
+#scrap_ul .scrap_del {position:absolute;top:10px;right:0}
 
 #scrap_do table {margin:0 0 10px;width:100%}
 #scrap_do textarea {width:99%;height:100px}
 
+/* 포인트 */
+#point_ul {margin:0 20px;padding:0;border-top:1px solid #e9e9e9;list-style:none}
+#point_ul li {position:relative;padding:10px 0;border-bottom:1px solid #e9e9e9}
+#point_ul .point_wrap02 {margin:5px 0 0;text-align:right}
+#point_ul .point_date {display:inline-block;margin:0 10px 0 0}
+
+#point_sum {margin:0 20px}
+#point_sum .sum_row {margin:0 0 1px;background:#f2f5f9}
+#point_sum .sum_row:after {display:block;visibility:hidden;clear:both;content:''}
+#point_sum .sum_tit, #point_sum .sum_val {display:block;margin:0 0 1px;padding:10px}
+#point_sum .sum_tit {clear:both;float:left;width:100px}
+#point_sum .sum_val {float:right}
+
 /* 회원 비밀번호 확인 */
 #mb_confirm {margin:30px 0}
 #mb_confirm h1 {margin:0 0 15px;padding:0 10px;font-size:1.3em}
diff --git a/skin/member/basic/memo.skin.php b/skin/member/basic/memo.skin.php
index a162310d4..f7477b5bf 100644
--- a/skin/member/basic/memo.skin.php
+++ b/skin/member/basic/memo.skin.php
@@ -32,8 +32,8 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
         <?php for ($i=0; $i<count($list); $i++) {  ?>
         <tr>
             <td><?php echo $list[$i]['name'] ?></td>
-            <td class="td_datetime"><a href="<?php echo $list[$i]['view_href'] ?>"><?php echo $list[$i]['send_datetime'] ?></font></td>
-            <td class="td_datetime"><a href="<?php echo $list[$i]['view_href'] ?>"><?php echo $list[$i]['read_datetime'] ?></font></td>
+            <td class="td_datetime"><a href="<?php echo $list[$i]['view_href'] ?>"><?php echo $list[$i]['send_datetime'] ?></a></td>
+            <td class="td_datetime"><a href="<?php echo $list[$i]['view_href'] ?>"><?php echo $list[$i]['read_datetime'] ?></a></td>
             <td class="td_mng"><a href="<?php echo $list[$i]['del_href'] ?>" onclick="del(this.href); return false;">삭제</a></td>
         </tr>
         <?php }  ?>
diff --git a/skin/member/basic/style.css b/skin/member/basic/style.css
index 0cd50a3a3..2c076e91b 100644
--- a/skin/member/basic/style.css
+++ b/skin/member/basic/style.css
@@ -133,8 +133,10 @@
 /* 쪽지 */
 #memo_view_contents {margin:0 auto 20px;width:90%}
 #memo_view_contents h1 {position:absolute;font-size:0;line-height:0;overflow:hidden}
+#memo_view_ul {margin:0;padding:0 0 10px;border-bottom:1px solid #eee;list-style:none}
+.memo_view_li {position:relative;padding:5px 0}
 .memo_view_subj {display:inline-block;width:65px}
-#memo_view section p {padding:10px;min-height:150px;height:auto !important;height:150px;background:#fff}
+#memo_view p {padding:10px 0;min-height:150px;height:auto !important;height:150px;background:#fff;line-height:1.8em}
 
 #memo_write textarea {height:100px}
 

From 0c35a1fa248a29e828a956fbeb9f24d96c13de2b Mon Sep 17 00:00:00 2001
From: whitedot <whitedot@naver.com>
Date: Wed, 12 Mar 2014 17:49:18 +0900
Subject: [PATCH 8/8] =?UTF-8?q?=EB=AA=A8=EB=B0=94=EC=9D=BC:=20#28=20?=
 =?UTF-8?q?=ED=8F=AC=EC=9D=B8=ED=8A=B8=EB=82=B4=EC=97=AD=20=EB=82=A0?=
 =?UTF-8?q?=EC=A7=9C=20=ED=91=9C=EC=8B=9C=20=EB=B0=A9=EB=B2=95/=EC=8A=A4?=
 =?UTF-8?q?=ED=83=80=EC=9D=BC=20=EB=B3=80=EA=B2=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 mobile/skin/member/basic/point.skin.php | 4 ++--
 mobile/skin/member/basic/style.css      | 5 +++--
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/mobile/skin/member/basic/point.skin.php b/mobile/skin/member/basic/point.skin.php
index 27e146bb6..93ce40a91 100644
--- a/mobile/skin/member/basic/point.skin.php
+++ b/mobile/skin/member/basic/point.skin.php
@@ -30,12 +30,12 @@ add_stylesheet('<link rel="stylesheet" href="'.$member_skin_url.'/style.css">',
             $po_content = $row['po_content'];
 
             $expr = '';
-            if($row['po_expired'] == 1)
+//            if($row['po_expired'] == 1)
                 $expr = ' txt_expired';
         ?>
         <li>
             <div class="point_wrap01">
-                <span class="point_date"><?php echo $row['po_datetime']; ?></span>
+                <span class="point_date"><?php echo conv_date_format('y-m-d H시', $row['po_datetime']); ?></span>
                 <span class="point_log"><?php echo $po_content; ?></span>
             </div>
             <div class="point_wrap02">
diff --git a/mobile/skin/member/basic/style.css b/mobile/skin/member/basic/style.css
index 5c27f4ffb..e19e30409 100644
--- a/mobile/skin/member/basic/style.css
+++ b/mobile/skin/member/basic/style.css
@@ -151,8 +151,9 @@
 /* 포인트 */
 #point_ul {margin:0 20px;padding:0;border-top:1px solid #e9e9e9;list-style:none}
 #point_ul li {position:relative;padding:10px 0;border-bottom:1px solid #e9e9e9}
-#point_ul .point_wrap02 {margin:5px 0 0;text-align:right}
-#point_ul .point_date {display:inline-block;margin:0 10px 0 0}
+#point_ul .point_wrap01 {position:relative;padding:0 0 0 90px}
+#point_ul .point_wrap02 {margin:7px 0 0;text-align:right}
+#point_ul .point_date {position:absolute;top:0;left:0}
 
 #point_sum {margin:0 20px}
 #point_sum .sum_row {margin:0 0 1px;background:#f2f5f9}