From 3b1703d91ab825346d29d19d2bc10180f468831d Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Mon, 11 Jun 2007 08:08:11 +0000
Subject: [PATCH] git-svn-id: http://xe-core.googlecode.com/svn/trunk@1590
 201d5d3c-b55e-5fd7-737f-ddc643e51545

---
 modules/board/skins/xe_list/comment.html  | 24 ++++++++--------
 modules/board/skins/xe_list/css/white.css | 34 +++++++++++++----------
 modules/board/skins/xe_list/header.html   |  2 +-
 modules/member/member.controller.php      |  8 ++++--
 4 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/modules/board/skins/xe_list/comment.html b/modules/board/skins/xe_list/comment.html
index 65eec9755..917824295 100644
--- a/modules/board/skins/xe_list/comment.html
+++ b/modules/board/skins/xe_list/comment.html
@@ -10,7 +10,7 @@
         <li>
         <!--@end-->
 
-            {$val->content}
+            <div class="member_{$val->member_srl} author">{htmlspecialchars($val->nick_name)}</div>
 
             <div class="replyOption">
                 <!--@if($val->is_granted || !$val->member_srl)-->
@@ -20,21 +20,21 @@
                     <a href="{getUrl('act','dispBoardReplyComment','comment_srl',$val->comment_srl)}"><img src="./images/{$module_info->colorset}/buttonReply.gif" alt="{$lang->cmd_reply}" width="20" height="18" /></a> 
             </div>
 
-            <address>
-                <span class="member_{$val->member_srl}">{htmlspecialchars($val->nick_name)}</span>
-                <span class="date">
-                    {zdate($val->regdate, "Y.m.d H:i")}
-                    <!--@if($grant->is_admin)-->
-                        ({$val->ipaddress})
-                    <!--@end-->
-                </span>
-            </address>
+            <div class="date">
+                {zdate($val->regdate, "Y.m.d H:i")}
+                <!--@if($grant->is_admin)-->
+                    ({$val->ipaddress})
+                <!--@end-->
+            </div>
+
+            <div class="replyContent">
+            {$val->content}
+            </div>
 
             <!--@if($val->uploaded_count && $val->uploaded_list)-->
                 <div class="fileAttached">
-                    <h5>{$lang->uploaded_file} : </h5>
                     <ul>
-                        <!--@foreach($document->uploaded_list as $key => $file)-->
+                        <!--@foreach($val->uploaded_list as $key => $file)-->
                         <li><a href="{getUrl('')}{$file->download_url}">{$file->source_filename} ({FileHandler::filesize($file->file_size)})({number_format($file->download_count)})</a></li>
                         <!--@end-->
                     </ul>
diff --git a/modules/board/skins/xe_list/css/white.css b/modules/board/skins/xe_list/css/white.css
index 35c3cc24b..56c242209 100644
--- a/modules/board/skins/xe_list/css/white.css
+++ b/modules/board/skins/xe_list/css/white.css
@@ -176,28 +176,32 @@ Jeong, Chan Myeong 070601~070630
 .boardRead .replyAndTrackback a strong { color:#ff6600;}
 .boardRead .replyAndTrackback a#toggleReply { background:url(../images/white/buttonToggleReply.gif) no-repeat right top;}
 .boardRead .replyAndTrackback a#toggleTrackback { background:url(../images/white/buttonToggleReply.gif) no-repeat right -13px;}
-.boardRead #reply,
+
 .boardRead #trackback { padding:.6em .6em; color:#666666;}
-.boardRead #reply li,
-.boardRead #trackback li { padding:.6em .8em .6em 1.6em; line-height:1.25em;}
-.boardRead #reply p,
+.boardRead #trackback li { padding:.6em .8em .6em 1.6em; line-height:1.25em; clear:both;}
 .boardRead #trackback p { display:inline; margin-bottom:1em;}
 .boardRead #trackback a { color:#666666;}
-.boardRead .replyOption { display:inline; white-space:nowrap; margin-left:.2em;}
-.boardRead .replyOption img { vertical-align:middle;}
-.boardRead #reply address,
-.boardRead #trackback address { display:block; padding:0 .3em 0 0;}
-.boardRead #reply address a,
+.boardRead #trackback address { display:block; padding:0 .3em 0 0; float:left; }
 .boardRead #trackback address a { font-size:.9em; color:#3074a5; margin-right:.3em;}
-.boardRead #reply address .date,
 .boardRead #trackback address .date { font:.8em Tahoma; color:#cccccc;}
+
+.boardRead #reply { padding:.6em .6em; color:#666666;}
+.boardRead #reply li { padding:.6em .8em .6em 1.6em; line-height:1.25em; clear:both;}
+.boardRead #reply p { display:inline; margin-bottom:1em;}
+.boardRead #reply .author { float:left; padding:0 .3em 0 0; font-size:.9em; color:#3074a5; margin-right:.3em;}
+.boardRead #reply .author a { font-size:.9em; color:#3074a5; margin-right:.3em;}
+.boardRead #reply .date { float:right; font:.8em Tahoma; color:#cccccc; margin:.3em 0 .5em 0;}
+
+.boardRead #reply .replyOption { float:right; white-space:nowrap; margin-left:.2em;}
+.boardRead #reply .replyOption img { vertical-align:middle;}
+
+.boardRead #reply .replyContent { clear:left; }
 .boardRead #reply .replyIndent { background:url(../images/white/iconReplyArrow.gif) no-repeat .2em .9em;}
 
-.boardRead #reply li .fileAttached { position:relative; _width:100%; border:1px solid #eaeae7; overflow:hidden; background:#fbfbfb; margin-top:.3em;}
-.boardRead #reply li .fileAttached h5 { position:absolute; top:1em; left:1.5em; font-weight:normal; color:#999999; float:left; font-size:1em; margin-right:.5em; line-height:1.5em;}
-.boardRead #reply li .fileAttached ul { float:left; padding:1em 1em .8em 0; margin-left:5em; _margin-left:2.5em;}
-.boardRead #reply li .fileAttached li { border:0px; display:inline; margin-right:.75em; line-height:1.5em;}
-.boardRead #reply li .fileAttached li a { font-size:.9em; padding:.1em 0 .1em 1.5em; white-space:nowrap; position:relative; color:#444444; background:url(../images/white/iconFile.gif) no-repeat left top;}
+.boardRead #reply li .fileAttached { _width:100%; border:1px solid #eaeae7; overflow:hidden; background:#fbfbfb; margin-top:.3em;}
+.boardRead #reply li .fileAttached ul { float:left; padding:.3em 1em .2em 0; margin-left:.5em; _margin-left:.25em;}
+.boardRead #reply li .fileAttached li { border:0px; display:inline; margin-right:.75em; line-height:1.5em; padding:.1em 0 .1em 1.5em; background:url(../images/white/iconFile.gif) no-repeat left;}
+.boardRead #reply li .fileAttached li a { font-size:.9em; white-space:nowrap; position:relative; color:#444444; }
 .boardRead #reply li .fileAttached li a:visited { color:#777777;}
 
 /* boardEditor */
diff --git a/modules/board/skins/xe_list/header.html b/modules/board/skins/xe_list/header.html
index 9df7c3cea..06a673dad 100644
--- a/modules/board/skins/xe_list/header.html
+++ b/modules/board/skins/xe_list/header.html
@@ -15,7 +15,7 @@
 <!-- 스킨의 제목/간단한 설명 출력 -->
 <!--@if($module_info->title)-->
     <div class="boardHeader">
-        <h3>{$module_info->title} - {$module_info->sub_title}</h3>
+        <h3>{$module_info->title}<!--@if($module_info->sub_title)--> - {$module_info->sub_title}<!--@end--></h3>
     </div>
 <!--@end-->
 
diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index 40bf7db79..7fab551fe 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -1028,10 +1028,12 @@
                         $text = sprintf('<img src="%s" border="0" alt="image" width="%s" height="%s" style="margin-top:%dpx;"/>', $image_name->file, $image_name->width, $image_name->height, $top_margin);
                     }
 
-                    if($image_mark->width) $buff = sprintf('<%s style="cursor:pointer;background:url(%s) no-repeat left;padding-left:%dpx; height:%dpx">%s</%s>', $matches[1],$image_mark->file, $image_mark->width+2, $image_mark->height, $text, $matches[6]);
-                    else $buff = $text;
+                    if($image_mark->width) {
+                        $matches[0] = str_replace('<'.$matches[6], sprintf('<%s style="cursor:pointer;background:url(%s) no-repeat left;padding-left:%dpx; height:%dpx" ', $matches[1],$image_mark->file, $image_mark->width+2, $image_mark->height), $matches[0] );
+                    }
+
+                    $GLOBALS['_transImageNameList'][$member_srl] = str_replace($matches[5], $text, $matches[0]);
 
-                    $GLOBALS['_transImageNameList'][$member_srl] = str_replace($matches[5], $buff, $matches[0]);
                 }
             }