From 4a414dfdd95d609118455f218d9cc24f06285bcd Mon Sep 17 00:00:00 2001
From: whitedot <whitedot@naver.com>
Date: Thu, 31 Jan 2013 15:53:13 +0900
Subject: [PATCH] =?UTF-8?q?=EC=82=AC=EC=9A=A9=EC=9E=90:=20=EC=AA=BD?=
 =?UTF-8?q?=EC=A7=80=20=EC=8A=A4=ED=83=80=EC=9D=BC=20=EC=9E=91=EC=97=85=20?=
 =?UTF-8?q?=EC=A4=91,=20=EC=83=81=EB=8B=A8=20=EA=B2=80=EC=83=89=EC=B0=BD?=
 =?UTF-8?q?=20ie=EC=97=90=EC=84=9C=20=EB=B2=84=ED=8A=BC=20=EB=96=A8?=
 =?UTF-8?q?=EC=96=B4=EC=A7=80=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=ED=95=B4?=
 =?UTF-8?q?=EA=B2=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 css/default.css                    |  6 ++++++
 head.php                           |  3 +--
 skin/member/neo/memo.skin.php      |  6 +++---
 skin/member/neo/memo_form.skin.php |  6 +++---
 skin/member/neo/memo_view.skin.php | 30 +++++++++++++++++-------------
 5 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/css/default.css b/css/default.css
index e60704680..186e1e12f 100644
--- a/css/default.css
+++ b/css/default.css
@@ -240,6 +240,12 @@ fieldset button {padding:0 15px;height:24px;border:0;background:#494949;color:#f
 
 /* 쪽지 */
 #memo_view section {margin:0 auto 20px;padding:20px;width:87%}
+#memo_view section h2 {width:0;height:0;overflow:hidden}
+#memo_view_ul {margin:0;padding:0 0 10px;border-bottom:1px solid #f7f7f2;list-style:none}
+.memo_view_li {position:relative;padding:5px 0}
+.memo_view_subj {display:inline-block;width:65px}
+#memo_view_ul a {color:#000;text-decoration:none}
+#memo_view section p {min-height:150px;height:auto !important;height:150px}
 
 #memo_write textarea {height:100px}
 
diff --git a/head.php b/head.php
index 4415ebb6d..3a5afd6cc 100644
--- a/head.php
+++ b/head.php
@@ -37,8 +37,7 @@ include_once(G4_LIB_PATH.'/popular.lib.php');
             <form name="fsearchbox" method="get" action="<?=G4_BBS_URL?>/search.php" onsubmit="return fsearchbox_submit(this);">
             <input type="hidden" name="sfl" value="wr_subject||wr_content">
             <input type="hidden" name="sop" value="and">
-            <input type="text" id="schall_stx" name="stx" title="검색어" maxlength="20">
-            <input type="image" id="schall_submit" src="<?=G4_IMG_URL?>/btn_search.jpg" alt="검색">
+            <input type="text" id="schall_stx" name="stx" title="검색어" maxlength="20"><input type="image" id="schall_submit" src="<?=G4_IMG_URL?>/btn_search.jpg" alt="검색">
             </form>
 
             <script>
diff --git a/skin/member/neo/memo.skin.php b/skin/member/neo/memo.skin.php
index 52cd4ac9e..269b389d2 100644
--- a/skin/member/neo/memo.skin.php
+++ b/skin/member/neo/memo.skin.php
@@ -6,9 +6,9 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
     <h1><?=$g4['title']?></h1>
 
     <ul class="new_win_ul">
-        <li><a href="./memo.php?kind=recv">받은쪽지</a></li>
-        <li><a href="./memo.php?kind=send">보낸쪽지</a></li>
-        <li><a href="./memo_form.php">쪽지보내기</a></li>
+        <li><a href="./memo.php?kind=recv">수신함</a></li>
+        <li><a href="./memo.php?kind=send">발신함</a></li>
+        <li><a href="./memo_form.php">쪽지쓰기</a></li>
     </ul>
 
     <table>
diff --git a/skin/member/neo/memo_form.skin.php b/skin/member/neo/memo_form.skin.php
index e147f9941..8f3838fd0 100644
--- a/skin/member/neo/memo_form.skin.php
+++ b/skin/member/neo/memo_form.skin.php
@@ -6,9 +6,9 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
     <h1>쪽지보내기</h1>
 
     <ul class="new_win_ul">
-        <li><a href="./memo.php?kind=recv">받은쪽지</a></li>
-        <li><a href="./memo.php?kind=send">보낸쪽지</a></li>
-        <li><a href="./memo_form.php">쪽지보내기</a></li>
+        <li><a href="./memo.php?kind=recv">수신함</a></li>
+        <li><a href="./memo.php?kind=send">발신함</a></li>
+        <li><a href="./memo_form.php">쪽지쓰기</a></li>
     </ul>
 
     <form name="fmemoform" method="post" action="./memo_form_update.php" onsubmit="return fmemoform_submit(this);" autocomplete="off">
diff --git a/skin/member/neo/memo_view.skin.php b/skin/member/neo/memo_view.skin.php
index 51aa3a6a1..e6a46a1bc 100644
--- a/skin/member/neo/memo_view.skin.php
+++ b/skin/member/neo/memo_view.skin.php
@@ -1,25 +1,29 @@
 <?
 if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
+$nick = get_sideview($mb['mb_id'], $mb['mb_nick'], $mb['mb_email'], $mb['mb_homepage']);
+if($kind == "recv") $kind_str = "수신";
+else $kind_str = "발신";
 ?>
 
 <div id="memo_view" class="new_win">
     <h1><?=$g4['title']?></h1>
     <ul class="new_win_ul">
-        <li><a href="./memo.php?kind=recv">받은쪽지</a></li>
-        <li><a href="./memo.php?kind=send">보낸쪽지</a></li>
-        <li><a href="./memo_form.php">쪽지보내기</a></li>
+        <li><a href="./memo.php?kind=recv">수신함</a></li>
+        <li><a href="./memo.php?kind=send">발신함</a></li>
+        <li><a href="./memo_form.php">쪽지쓰기</a></li>
     </ul>
     <section class="cbg">
-        <h2>
-            <?
-            //$nick = cut_str($mb[mb_nick], $config[cf_cut_name]);
-            $nick = get_sideview($mb['mb_id'], $mb['mb_nick'], $mb['mb_email'], $mb['mb_homepage']);
-            if ($kind == "recv")
-                echo "{$nick}님께서 {$memo['me_send_datetime']}에 보내온 쪽지의 내용입니다.";
-            if ($kind == "send")
-                echo "{$nick}님께 {$memo['me_send_datetime']}에 보낸 쪽지의 내용입니다.";
-            ?>
-        </h2>
+        <h2>쪽지 내용</h2>
+        <ul id="memo_view_ul">
+            <li class="memo_view_li">
+                <span class="memo_view_subj"><?=$kind_str?>자</span>
+                <strong><?=$nick?></strong>
+            </li>
+            <li class="memo_view_li">
+                <span class="memo_view_subj"><?=$kind_str?>일시</span>
+                <strong><?=$memo['me_send_datetime']?></strong>
+            </li>
+        </ul>
         <p>
             <?=conv_content($memo['me_memo'], 0)?>
         </p>