From 93523865603604f45880c246bf3ac116fe4552ae Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Mon, 31 Mar 2008 03:15:28 +0000
Subject: [PATCH] =?UTF-8?q?=EA=B4=80=EB=A6=AC=EC=9E=90=20=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9D=98=20=EB=8C=93=EA=B8=80/=ED=9A=8C?=
 =?UTF-8?q?=EC=9B=90/=EB=AC=B8=EC=84=9C=EB=AA=A9=EB=A1=9D=EC=9D=84=20?=
 =?UTF-8?q?=EC=A0=95=EB=A6=AC?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@4060 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/comment/tpl/comment_list.html   | 14 +++++-----
 modules/document/tpl/document_list.html | 35 +++++++++++++------------
 modules/member/tpl/member_list.html     |  2 +-
 3 files changed, 26 insertions(+), 25 deletions(-)

diff --git a/modules/comment/tpl/comment_list.html b/modules/comment/tpl/comment_list.html
index 00444be89..edd05f398 100644
--- a/modules/comment/tpl/comment_list.html
+++ b/modules/comment/tpl/comment_list.html
@@ -16,7 +16,7 @@
 <col />
 <col width="150" />
 <col width="65" />
-<col width="85" />
+<col width="65" />
 <col width="90" />
 <col width="45" />
 
@@ -25,7 +25,7 @@
 <col />
 <col width="150" />
 <col width="75" />
-<col width="85" />
+<col width="75" />
 <col width="90" />
 <col width="45" />
 
@@ -43,7 +43,7 @@
 <col />
 <col width="150" />
 <col width="75" />
-<col width="85" />
+<col width="75" />
 <col width="90" />
 <col width="45" />
 
@@ -52,7 +52,7 @@
 <col />
 <col width="150" />
 <col width="75" />
-<col width="90" />
+<col width="75" />
 <col width="90" />
 <col width="50" />
 
@@ -61,7 +61,7 @@
 <col />
 <col width="150" />
 <col width="75" />
-<col width="85" />
+<col width="75" />
 <col width="90" />
 <col width="95" />
 <!--@end-->
@@ -92,8 +92,8 @@
         <td rowspan="2" class="tahoma">{$no}</td>
         <td class="blue"><a href="./?mid={$module_list[$val->module_srl]->mid}" onclick="window.open(this.href);return false">{htmlspecialchars($module_list[$val->module_srl]->browser_title)}</a></td>
         <td><div class="member_{$val->member_srl}">{htmlspecialchars($val->nick_name)}</div></td>
-        <td class="tahoma">{zdate($val->regdate,"Y-m-d")}</td>
-        <td class="tahoma"><!--@if($val->last_update)-->{zdate($val->last_update, 'Y-m-d H:i:s')}<!--@else-->&nbsp;<!--@end--></td>
+        <td class="tahoma">{nl2br(zdate($val->regdate,"Y-m-d\nH:i:s"))}</td>
+        <td class="tahoma"><!--@if($val->last_update)-->{nl2br(zdate($val->last_update, "Y-m-d\nH:i:s"))}<!--@else-->&nbsp;<!--@end--></td>
         <td class="tahoma">{$val->ipaddress}</td>
         <td class="blue"><a href="{getUrl('','document_srl',$val->document_srl)}#comment_{$val->comment_srl}" onclick="window.open(this.href);return false;">{$lang->cmd_move}</a></td>
     </tr>
diff --git a/modules/document/tpl/document_list.html b/modules/document/tpl/document_list.html
index e21cc2c78..dc560e808 100644
--- a/modules/document/tpl/document_list.html
+++ b/modules/document/tpl/document_list.html
@@ -13,30 +13,29 @@
 
 <!-- 목록 -->
 <table cellspacing="0" class="adminTable">
+<thead>
 <!--@if($lang_type == 'ko')-->
-{@ $col_width = array(50,40,0,150,55,55,65)}
+{@ $col_width = array(50,0,150,55,55,65)}
 <!--@else if($lang_type == 'en')-->
-{@ $col_width = array(50,40,0,150,55,55,75)}
+{@ $col_width = array(50,0,150,55,55,75)}
 <!--@else if($lang_type == 'zh-CN')-->
-{@ $col_width = array(50,40,0,150,50,50,70)}
+{@ $col_width = array(50,0,150,50,50,70)}
 <!--@else if($lang_type == 'jp')-->
-{@ $col_width = array(50,40,0,150,55,55,75)}
+{@ $col_width = array(50,0,150,55,55,75)}
 <!--@else if($lang_type == 'es')-->
-{@ $col_width = array(50,40,0,150,55,110,75)}
+{@ $col_width = array(50,0,150,55,110,75)}
 <!--@else if($lang_type == 'ru')-->
-{@ $col_width = array(50,40,0,150,50,60,65)}
+{@ $col_width = array(50,0,150,50,60,65)}
 <!--@end-->
 
 <!--@foreach($col_width as $width)-->
 <col <!--@if($width)-->width="{$width}" <!--@end-->/>
 <!--@end-->
-
-<thead>
     <tr>
         <th scope="col">{$lang->no}</th>
-        <th scope="col"><input type="checkbox" onclick="clickCheckBoxAll(this.form, 'cart'); return false;" /></th>
         <th scope="col">
             <div class="nowrap">
+                <input type="checkbox" onclick="clickCheckBoxAll(this.form, 'cart'); return false;" />
                 <select name="module_srl" id="module_srl" class="w230">
                     <option value="">{$lang->module}</option>
                     <!--@foreach($mid_list as $key => $val)-->
@@ -55,13 +54,19 @@
 <tbody>
     <!--@foreach($document_list as $no => $oDocument)-->
     <tr>
-        <td class="tahoma">{$no}</td>
-        <td><input type="checkbox" name="cart" value="{$oDocument->document_srl}" onclick="doAddDocumentCart(this)" <!--@if($oDocument->isCarted())-->checked="checked"<!--@end-->/></td>
-        <td class="left subject">
+        <td class="tahoma" rowspan="2">{$no}</td>
+        <td class="left"><!--@if($oDocument->get('module_srl')!=$oDocument->get('member_srl'))--><a href="{getUrl('','mid',$module_list[$oDocument->get('module_srl')]->mid)}" class="blue" onclick="window.open(this.href);return false">{htmlspecialchars($module_list[$oDocument->get('module_srl')]->browser_title)}</a><!--@else-->-<!--@end--></td>
+        <td class="left"><div class="member_{$oDocument->get('member_srl')}">{$oDocument->getNickName()}</div></td>
+        <td class="tahoma">{$oDocument->get('readed_count')}</td>
+        <td class="tahoma">{$oDocument->get('voted_count')}</td>
+        <td class="tahoma">{$oDocument->getRegdate("Y-m-d")} {$oDocument->getRegdate("H:i:s")}</td>
+    </tr>
+    <tr>
+        <td class="left subject" colspan="5">
+            <input type="checkbox" name="cart" value="{$oDocument->document_srl}" onclick="doAddDocumentCart(this)" <!--@if($oDocument->isCarted())-->checked="checked"<!--@end-->/>
             <!--@if($oDocument->get('module_srl')==$oDocument->get('member_srl'))-->
                 {$lang->cmd_save}
             <!--@else-->
-                <a href="{getUrl('','mid',$module_list[$oDocument->get('module_srl')]->mid)}" class="blue" onclick="window.open(this.href);return false">[{htmlspecialchars($module_list[$oDocument->get('module_srl')]->browser_title)}]</a><br />
                 <a href="{getUrl('','document_srl',$oDocument->document_srl)}" onclick="window.open(this.href);return false">{$oDocument->getTitle()}</a>
             <!--@end-->
 
@@ -73,10 +78,6 @@
                 [{$oDocument->getTrackbackCount()}]
             <!--@end-->
         </td>
-        <td class="left"><div class="member_{$oDocument->get('member_srl')}">{$oDocument->getNickName()}</div></td>
-        <td class="tahoma">{$oDocument->get('readed_count')}</td>
-        <td class="tahoma">{$oDocument->get('voted_count')}</td>
-        <td class="tahoma">{$oDocument->getRegdate("Y-m-d")}</td>
     </tr>
     <!--@end-->
 </tbody>
diff --git a/modules/member/tpl/member_list.html b/modules/member/tpl/member_list.html
index 17b7a5c7f..56e34322f 100644
--- a/modules/member/tpl/member_list.html
+++ b/modules/member/tpl/member_list.html
@@ -80,7 +80,7 @@
         </td>
         <td>{htmlspecialchars($val->user_name)}</td>
         <td><div class="member_{$val->member_srl}">{htmlspecialchars($val->nick_name)}</div></td>
-        <td class="tahoma">{zdate($val->regdate,"Y-m-d")}</td>
+        <td class="tahoma">{zdate($val->regdate,"Y-m-d H:i:s")}</td>
     </tr>
     <tr>
         <td class="red"><!--@if($val->is_admin != 'Y')--><a href="{getUrl('act','dispMemberAdminDeleteForm','member_srl', $val->member_srl)}">{$lang->cmd_delete}</a><!--@else--><img src="./images/icon_management.gif" title="{$lang->is_admin}" alt="{$lang->is_admin}" /><!--@end--></td>