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

css/default.css

@@ -105,7 +105,7 @@ tfoot td {border-color:#c9c9c9;background:#f9f9f5;font-weight:bold;text-align:ce
 caption {padding:0 0 10px;text-align:left}
 th {padding:12px 0 8px;border-top:1px solid #ddd;border-bottom:1px solid #ddd}
 th input {vertical-align:top} /* middle 로 하면 게시판 읽기에서 목록 사용시 체크박스 라인 깨짐 */
-td {padding:10px 5px 7px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;line-height:1.5em;word-break:break-all}
+td {padding:10px 5px 7px;border-top:1px solid #e9e9e9;border-bottom:1px solid #e9e9e9;background:#fff;line-height:1.5em;word-break:break-all}
 table a {color:#000;text-decoration:none}
 .bo_sideview td {padding:7px 5px} /* 사이드뷰 사용하는 테이블 셀 패딩값 */
 .empty_table {padding:85px 0;text-align:center}
@@ -114,7 +114,7 @@ table a {color:#000;text-decoration:none}
 .frm_tbl {}
 .frm_tbl caption {padding-top:10px;font-size:1.2em;font-weight:bold}
 .frm_tbl th {padding-left:10px;width:100px;border-top:1px solid #eee;border-bottom:1px solid #eee;text-align:left}
-.frm_tbl td {padding:7px 10px;border-color:#eee}
+.frm_tbl td {padding:7px 10px;border-color:#eee;background:transparent}
 .frm_tbl textarea,
 .frm_input {padding:2px 2px 3px;border:1px solid #d7d7d7;background:#fff;vertical-align:middle}
 .frm_tbl textarea:focus,
@@ -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}
 

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="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="image" id="schall_submit" src="<?=G4_IMG_URL?>/btn_search.jpg" alt="검색">
             </form>
 
             <script>

skin/member/neo/memo.skin.php

@@ -8,7 +8,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
     <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_form.php">쪽지쓰기</a></li>
     </ul>
 
     <table>

skin/member/neo/memo_form.skin.php

@@ -8,7 +8,7 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
     <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_form.php">쪽지쓰기</a></li>
     </ul>
 
     <form name="fmemoform" method="post" action="./memo_form_update.php" onsubmit="return fmemoform_submit(this);" autocomplete="off">

skin/member/neo/memo_view.skin.php

@@ -1,5 +1,14 @@
 <?
 if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
+$nick = get_sideview($mb['mb_id'], $mb['mb_nick'], $mb['mb_email'], $mb['mb_homepage']);
+if($kind == "recv") {
+    $kind_str = "보낸";
+    $kind_date = "받은";
+}
+else {
+    $kind_str = "받는";
+    $kind_date = "보낸";
+}
 ?>
 
 <div id="memo_view" class="new_win">
@@ -7,19 +16,20 @@ if (!defined("_GNUBOARD_")) exit; // 개별 페이지 접근 불가
     <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_form.php">쪽지쓰기</a></li>
     </ul>
     <section class="cbg">
-        <h2>
+        <h2>쪽지 내용</h2>
-            <?
+        <ul id="memo_view_ul">
-            //$nick = cut_str($mb[mb_nick], $config[cf_cut_name]);
+            <li class="memo_view_li">
-            $nick = get_sideview($mb['mb_id'], $mb['mb_nick'], $mb['mb_email'], $mb['mb_homepage']);
+                <span class="memo_view_subj"><?=$kind_str?>사람</span>
-            if ($kind == "recv")
+                <strong><?=$nick?></strong>
-                echo "{$nick}님께서 {$memo['me_send_datetime']}에 보내온 쪽지의 내용입니다.";
+            </li>
-            if ($kind == "send")
+            <li class="memo_view_li">
-                echo "{$nick}님께 {$memo['me_send_datetime']}에 보낸 쪽지의 내용입니다.";
+                <span class="memo_view_subj"><?=$kind_date?>시간</span>
-            ?>
+                <strong><?=$memo['me_send_datetime']?></strong>
-        </h2>
+            </li>
+        </ul>
         <p>
             <?=conv_content($memo['me_memo'], 0)?>
         </p>