From e669b6cc2f42d891895fc511c1c6519753bb403c Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Tue, 9 Oct 2007 08:43:08 +0000
Subject: [PATCH 01/29] =?UTF-8?q?=EC=98=B5=ED=8B=B0=EB=A7=88=EC=9D=B4?=
 =?UTF-8?q?=EC=A0=80=20=EC=82=AC=EC=9A=A9=20=EC=9C=A0=EB=AC=B4=EC=97=90=20?=
 =?UTF-8?q?=EB=8C=80=ED=95=9C=20=EA=B0=92=20=EC=B2=B4=ED=81=AC=20=EB=B6=80?=
 =?UTF-8?q?=EB=B6=84=EC=9D=98=20=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

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@2709 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/admin/admin.admin.view.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/admin/admin.admin.view.php b/modules/admin/admin.admin.view.php
index 547a21741..d8c739104 100644
--- a/modules/admin/admin.admin.view.php
+++ b/modules/admin/admin.admin.view.php
@@ -38,7 +38,7 @@
             Context::set('time_zone_list', $GLOBALS['time_zone']);
             Context::set('time_zone', $GLOBALS['_time_zone']);
             Context::set('use_rewrite', $db_info->use_rewrite=='Y'?'Y':'N');
-            Context::set('use_optimizer', $db_info->use_optimizer==''?'Y':'N');
+            Context::set('use_optimizer', $db_info->use_optimizer!='N'?'Y':'N');
 
             Context::setBrowserTitle("ZeroboardXE Admin Page");
         }

From de09885fb9742d09a5010e0928e1f04f19bf530a Mon Sep 17 00:00:00 2001
From: haneul <syhan@cs.washington.edu>
Date: Tue, 9 Oct 2007 17:50:26 +0000
Subject: [PATCH 02/29] =?UTF-8?q?optimizer=20=EC=84=A4=EB=AA=85=20?=
 =?UTF-8?q?=EB=B6=80=EB=B6=84=20=EC=98=81=EB=AC=B8=20=EB=B2=88=EC=97=AD?=
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@2712 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/install/lang/en.lang.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/install/lang/en.lang.php b/modules/install/lang/en.lang.php
index e9d35a982..b6bf4c30f 100644
--- a/modules/install/lang/en.lang.php
+++ b/modules/install/lang/en.lang.php
@@ -162,8 +162,8 @@ EndOfLicense;
     $lang->admin_title = 'Administrator Info';
 
     $lang->env_title = 'Configuration';
-    $lang->use_optimizer = 'Optimizer 사용';
-    $lang->about_optimizer = 'Optimizer를 사용하면 다수의 CSS/ JS파일을 통합/압축 전송하여 매우 빠르게 사이트 접속이 가능하게 합니다.<br />다만 CSS나 JS에 따라서 문제가 생길 수 있습니다. 이때는 Optimizer 비활성화 하시면 정상적인 동작은 가능합니다';
+    $lang->use_optimizer = 'Enable Optimizer';
+    $lang->about_optimizer = 'If optimizer is enabled, users can quickly access to this site, since multiple CSS / JS files are put together and compressed before transmission. <br /> Nevertheless, this optimization might be problematic according to CSS or JS. If you disable it, it would work properly though it would work slower.';
     $lang->use_rewrite = 'Use rewrite mod';
     $lang->about_rewrite = "If web server provides rewrite mod, long URL such as http://blah/?document_srl=123 can be shortened like http://blah/123";
     $lang->time_zone = 'Time zone';

From ef25eb818a34c782a316e23061152a20a3d16dea Mon Sep 17 00:00:00 2001
From: k10206 <k10206@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Tue, 9 Oct 2007 23:40:54 +0000
Subject: [PATCH 03/29] =?UTF-8?q?#176,=20member,=20point=20=ED=85=8C?=
 =?UTF-8?q?=EC=9D=B4=EB=B8=94=20=EB=B9=84=EA=B5=90=20=ED=9B=84=20=EC=97=86?=
 =?UTF-8?q?=EB=8A=94=20=EA=B0=92=20=EC=82=BD=EC=9E=85=ED=95=98=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=ED=95=A8,=20outer=20join=20=ED=95=B4=EA=B2=B0=20?=
 =?UTF-8?q?=EC=A0=84=EA=B9=8C=EC=A7=80=20=EC=9E=84=EC=8B=9C=20=EB=B0=A9?=
 =?UTF-8?q?=ED=8E=B8?=
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@2713 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/point/point.admin.view.php            |  4 +++
 modules/point/point.model.php                 | 34 ++++++++++++++++++-
 modules/point/queries/getMemberCount.xml      |  8 +++++
 modules/point/queries/getMemberList.xml       |  3 ++
 .../queries/getMemberListWithinGroup.xml      |  3 ++
 modules/point/queries/getPointCount.xml       |  8 +++++
 6 files changed, 59 insertions(+), 1 deletion(-)
 create mode 100644 modules/point/queries/getMemberCount.xml
 create mode 100644 modules/point/queries/getPointCount.xml

diff --git a/modules/point/point.admin.view.php b/modules/point/point.admin.view.php
index 29cbb7c80..10b42accb 100644
--- a/modules/point/point.admin.view.php
+++ b/modules/point/point.admin.view.php
@@ -60,9 +60,13 @@
          **/
         function dispPointAdminPointList() {
             $oPointModel = &getModel('point');
+
             $args->list_count = 20;
             $args->page = Context::get('page');
 
+            //회원 목록 갱신
+            if($args->page <= 1) $oPointModel->updateMemberList();
+
             $output = $oPointModel->getMemberList($args);
             // 템플릿에 쓰기 위해서 context::set
             Context::set('total_count', $output->total_count);
diff --git a/modules/point/point.model.php b/modules/point/point.model.php
index 12d6755ae..201c4fd35 100644
--- a/modules/point/point.model.php
+++ b/modules/point/point.model.php
@@ -53,6 +53,38 @@
             return $level;
         }
 
+        /**
+         * @brief 회원 목록 갱신
+         **/
+        function updateMemberList() {
+            $output = executeQuery("point.getPointCount");
+            $point_count = $output->data->count;
+
+            $output = executeQuery("point.getMemberCount");
+            $member_count = count($output->data);
+
+            if($member_count > $point_count) {
+                foreach($output->data as $key => $val) {
+
+                    // 포인트가 있는지 체크
+                    if($this->isExistsPoint($val->member_srl)) continue;
+
+                    // 변수 설정
+                    $args->member_srl = $val->member_srl;
+                    $args->point = 0;
+
+                    $insert = executeQuery("point.insertPoint", $args);
+
+                    // 캐시 설정
+                    $cache_path = sprintf('./files/member_extra_info/point/%s/', getNumberingPath($val->member_srl));
+                    FileHandler::makedir($cache_path);
+
+                    $cache_filename = sprintf('%s%d.cache.txt', $cache_path, $val->member_srl);
+                    FileHandler::writeFile($cache_filename, 0);
+                }
+            }
+        }
+
         /**
          * @brief 포인트 순 회원목록 가져오기
          **/
@@ -110,7 +142,7 @@
                 $config = $oModuleModel->getModuleConfig('point');
 
                 foreach($output->data as $key => $val) {
-                    $output->data[$key]->level = $this->getLevel($point, $config->level_step);
+                    $output->data[$key]->level = $this->getLevel($val->point, $config->level_step);
                 }
             }
 
diff --git a/modules/point/queries/getMemberCount.xml b/modules/point/queries/getMemberCount.xml
new file mode 100644
index 000000000..e59d056e1
--- /dev/null
+++ b/modules/point/queries/getMemberCount.xml
@@ -0,0 +1,8 @@
+<query id="getMemberCount" action="select">
+    <tables>
+        <table name="member" />
+    </tables>
+    <columns>
+        <column name="member_srl" />
+    </columns>
+</query>
\ No newline at end of file
diff --git a/modules/point/queries/getMemberList.xml b/modules/point/queries/getMemberList.xml
index a03c40365..9634aabb8 100644
--- a/modules/point/queries/getMemberList.xml
+++ b/modules/point/queries/getMemberList.xml
@@ -21,6 +21,9 @@
             <condition operation="like_prefix" column="last_login" var="s_last_login" pipe="or" />
         </group>
     </conditions>
+    <groups>
+        <group column="member.member_srl" />
+    </groups>
     <navigation>
         <index var="sort_index" default="point" order="desc" />
         <list_count var="list_count" default="20" />
diff --git a/modules/point/queries/getMemberListWithinGroup.xml b/modules/point/queries/getMemberListWithinGroup.xml
index f3ab2fad7..d449283c4 100644
--- a/modules/point/queries/getMemberListWithinGroup.xml
+++ b/modules/point/queries/getMemberListWithinGroup.xml
@@ -26,6 +26,9 @@
             <condition operation="like_prefix" column="member.last_login" var="s_last_login" pipe="or" />
         </group>
     </conditions>
+    <groups>
+        <group column="member.member_srl" />
+    </groups>
     <navigation>
         <index var="sort_index" default="point" order="desc" />
         <list_count var="list_count" default="20" />
diff --git a/modules/point/queries/getPointCount.xml b/modules/point/queries/getPointCount.xml
new file mode 100644
index 000000000..d336275cf
--- /dev/null
+++ b/modules/point/queries/getPointCount.xml
@@ -0,0 +1,8 @@
+<query id="getPointCount" action="select">
+    <tables>
+        <table name="point" />
+    </tables>
+    <columns>
+        <column name="count(*)" alias="count" />
+    </columns>
+</query>
\ No newline at end of file

From 2906a845aff5922e2f5ae1b206fc8249ab8e6d3e Mon Sep 17 00:00:00 2001
From: venister <venister@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Wed, 10 Oct 2007 01:47:45 +0000
Subject: [PATCH 04/29] =?UTF-8?q?editor.js=20=ED=99=9C=EC=84=B1=ED=99=94?=
 =?UTF-8?q?=EC=8B=9C=20=EC=8B=A4=ED=8C=A8=EB=9D=BC=EB=8A=94=20=EB=A9=94?=
 =?UTF-8?q?=EC=8B=9C=EC=A7=80=20=EB=9C=A8=EC=A7=80=20=EC=95=8A=EB=8F=84?=
 =?UTF-8?q?=EB=A1=9D=20=EC=A3=BC=EC=84=9D=EC=B2=98=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@2714 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/editor/tpl/js/editor.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/editor/tpl/js/editor.js b/modules/editor/tpl/js/editor.js
index f40f4a08a..50e6ecd10 100755
--- a/modules/editor/tpl/js/editor.js
+++ b/modules/editor/tpl/js/editor.js
@@ -189,7 +189,7 @@ function editorStart(editor_sequence, primary_key, content_key, resizable, edito
         // iframe에 focus가 될때 에디터 모드로 전환하도록 이벤트 지정
         if(xIE4Up) xAddEventListener(iframe_obj, "focus", editor_start_func[editor_sequence] );
         else xAddEventListener(iframe_obj.contentWindow, "focus", editor_start_func[editor_sequence] );
-        alert('실패');
+        //alert('실패');
     }
 
     xAddEventListener(document,'mouseup',editorEventCheck);

From 88f4bb1ba5e3d1008622bdca8f7c4c0981085ebb Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Wed, 10 Oct 2007 01:50:37 +0000
Subject: [PATCH 05/29] =?UTF-8?q?Optimizer=20=EC=82=AC=EC=9A=A9=EC=8B=9C?=
 =?UTF-8?q?=20css=ED=8C=8C=EC=9D=BC=EC=9D=B4=20utf-8=EC=9D=B4=20=EC=95=84?=
 =?UTF-8?q?=EB=8B=8C=20=EA=B2=BD=EC=9A=B0=20=EC=98=A4=EB=A5=98=EA=B0=80=20?=
 =?UTF-8?q?=EC=83=9D=EA=B8=B0=EB=8A=94=20=EA=B2=83=EC=9D=84=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
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@2715 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 classes/context/Context.class.php     | 11 +++++++++++
 classes/optimizer/Optimizer.class.php |  2 ++
 2 files changed, 13 insertions(+)

diff --git a/classes/context/Context.class.php b/classes/context/Context.class.php
index 06a610b0c..7caa8577b 100644
--- a/classes/context/Context.class.php
+++ b/classes/context/Context.class.php
@@ -355,6 +355,17 @@
             return $obj;
         }
 
+        /**
+         * @brief 특정 문자열만 utf-8로 변경
+         **/
+        function convertEncodingStr($str) {
+            $obj->str = $str;
+            $obj = Context::convertEncoding($obj);
+            return $obj->str;
+        }
+
+
+
         /**
          * @brief response method를 강제로 지정 (기본으로는 request method를 이용함)
          *
diff --git a/classes/optimizer/Optimizer.class.php b/classes/optimizer/Optimizer.class.php
index 58d92c504..519035517 100644
--- a/classes/optimizer/Optimizer.class.php
+++ b/classes/optimizer/Optimizer.class.php
@@ -91,6 +91,8 @@
                 $file = $targets[$i];
                 $str = FileHandler::readFile($file);
 
+                $str = Context::convertEncodingStr($str);
+
                 // css 일경우 background:url() 변경
                 if($type == "css") $str = $this->replaceCssPath($file, $str);
 

From 85aeeef7f373328f0bac6107bc5eab56d8e3d481 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Wed, 10 Oct 2007 04:00:29 +0000
Subject: [PATCH 06/29] =?UTF-8?q?=ED=8F=AC=EC=9D=B8=ED=8A=B8=20=EA=B8=B0?=
 =?UTF-8?q?=EB=A1=9D=EC=9D=B4=20=EC=97=86=EB=8A=94=20=EC=82=AC=EC=9A=A9?=
 =?UTF-8?q?=EC=9E=90=EC=97=90=20=EB=8C=80=ED=95=B4=20=EC=9D=BC=EA=B4=84=20?=
 =?UTF-8?q?=ED=8F=AC=EC=9D=B8=ED=8A=B8=20=EC=A0=81=EC=9A=A9=20=EC=BF=BC?=
 =?UTF-8?q?=EB=A6=AC=EA=B0=80=20=EC=82=AC=EC=9A=A9=EC=9E=90=EC=88=98?=
 =?UTF-8?q?=EA=B0=80=20=EB=A7=8E=EC=9D=84=20=EA=B2=BD=EC=9A=B0=20DB?=
 =?UTF-8?q?=EC=97=90=20=EB=AC=B4=EB=A6=AC=EB=A5=BC=20=EC=A3=BC=EA=B8=B0=20?=
 =?UTF-8?q?=EB=95=8C=EB=AC=B8=EC=97=90=20=EC=82=AD=EC=A0=9C?=
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@2716 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/point/point.admin.view.php |  4 +---
 modules/point/point.model.php      | 32 ------------------------------
 2 files changed, 1 insertion(+), 35 deletions(-)

diff --git a/modules/point/point.admin.view.php b/modules/point/point.admin.view.php
index 10b42accb..03949fc9b 100644
--- a/modules/point/point.admin.view.php
+++ b/modules/point/point.admin.view.php
@@ -64,10 +64,8 @@
             $args->list_count = 20;
             $args->page = Context::get('page');
 
-            //회원 목록 갱신
-            if($args->page <= 1) $oPointModel->updateMemberList();
-
             $output = $oPointModel->getMemberList($args);
+
             // 템플릿에 쓰기 위해서 context::set
             Context::set('total_count', $output->total_count);
             Context::set('total_page', $output->total_page);
diff --git a/modules/point/point.model.php b/modules/point/point.model.php
index 201c4fd35..01f929f56 100644
--- a/modules/point/point.model.php
+++ b/modules/point/point.model.php
@@ -53,38 +53,6 @@
             return $level;
         }
 
-        /**
-         * @brief 회원 목록 갱신
-         **/
-        function updateMemberList() {
-            $output = executeQuery("point.getPointCount");
-            $point_count = $output->data->count;
-
-            $output = executeQuery("point.getMemberCount");
-            $member_count = count($output->data);
-
-            if($member_count > $point_count) {
-                foreach($output->data as $key => $val) {
-
-                    // 포인트가 있는지 체크
-                    if($this->isExistsPoint($val->member_srl)) continue;
-
-                    // 변수 설정
-                    $args->member_srl = $val->member_srl;
-                    $args->point = 0;
-
-                    $insert = executeQuery("point.insertPoint", $args);
-
-                    // 캐시 설정
-                    $cache_path = sprintf('./files/member_extra_info/point/%s/', getNumberingPath($val->member_srl));
-                    FileHandler::makedir($cache_path);
-
-                    $cache_filename = sprintf('%s%d.cache.txt', $cache_path, $val->member_srl);
-                    FileHandler::writeFile($cache_filename, 0);
-                }
-            }
-        }
-
         /**
          * @brief 포인트 순 회원목록 가져오기
          **/

From faf518676fb223bdbd561b19e052e2ba6c504d79 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Wed, 10 Oct 2007 04:00:53 +0000
Subject: [PATCH 07/29] =?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=ED=85=9C=ED=94=8C=EB=A6=BF=20?=
 =?UTF-8?q?=EC=A4=91=20IE6=EC=97=90=EC=84=9C=20=EB=B9=88=EC=B9=B8=EC=9C=BC?=
 =?UTF-8?q?=EB=A1=9C=20=EB=82=98=EC=98=A4=EB=8D=98=20=EA=B2=83=EA=B3=BC=20?=
 =?UTF-8?q?GO=20=EB=B2=84=ED=8A=BC=EC=9D=B4=20=EC=A4=84=20=EB=82=98?=
 =?UTF-8?q?=EB=88=A0=EC=A7=80=EB=8A=94=20=EB=B6=80=EB=B6=84=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@2717 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/blog/tpl/blog_info.html         | 8 ++++----
 modules/board/tpl/board_info.html       | 8 ++++----
 modules/document/tpl/document_list.html | 6 +++---
 modules/file/tpl/file_list.html         | 4 ++--
 modules/opage/tpl/index.html            | 2 +-
 modules/page/tpl/index.html             | 2 +-
 6 files changed, 15 insertions(+), 15 deletions(-)

diff --git a/modules/blog/tpl/blog_info.html b/modules/blog/tpl/blog_info.html
index f5938d492..473c7543b 100644
--- a/modules/blog/tpl/blog_info.html
+++ b/modules/blog/tpl/blog_info.html
@@ -35,19 +35,19 @@
 </tr>
 <tr>
     <th scope="row">{$lang->description}</th>
-    <td>{nl2br(htmlspecialchars($module_info->description))}</td>
+    <td>{nl2br(htmlspecialchars($module_info->description))}&nbsp;</td>
 </tr>
 <tr>
     <th scope="row">{$lang->header_text}</th>
-    <td>{htmlspecialchars($module_info->header_text)}</td>
+    <td>{htmlspecialchars($module_info->header_text)}&nbsp;</td>
 </tr>
 <tr>
     <th scope="row">{$lang->footer_text}</th>
-    <td>{htmlspecialchars($module_info->footer_text)}</td>
+    <td>{htmlspecialchars($module_info->footer_text)}&nbsp;</td>
 </tr>
 <tr>
     <th scope="row">{$lang->admin_id}</th>
-    <td><!--@if(is_array($module_info->admin_id))-->{implode(",",$module_info->admin_id)}<!--@end--></td>
+    <td><!--@if(is_array($module_info->admin_id))-->{implode(",",$module_info->admin_id)}<!--@end-->&nbsp;</td>
 </tr>
 </table>
 
diff --git a/modules/board/tpl/board_info.html b/modules/board/tpl/board_info.html
index f5639c5e6..60b4026c4 100644
--- a/modules/board/tpl/board_info.html
+++ b/modules/board/tpl/board_info.html
@@ -49,19 +49,19 @@
 </tr>
 <tr>
     <th scope="row">{$lang->description}</th>
-    <td>{nl2br(htmlspecialchars($module_info->description))}</td>
+    <td>{nl2br(htmlspecialchars($module_info->description))}&nbsp;</td>
 </tr>
 <tr>
     <th scope="row">{$lang->header_text}</th>
-    <td>{htmlspecialchars($module_info->header_text)}</td>
+    <td>{htmlspecialchars($module_info->header_text)}&nbsp;</td>
 </tr>
 <tr>
     <th scope="row">{$lang->footer_text}</th>
-    <td>{htmlspecialchars($module_info->footer_text)}</td>
+    <td>{htmlspecialchars($module_info->footer_text)}&nbsp;</td>
 </tr>
 <tr>
     <th scope="row">{$lang->admin_id}</th>
-    <td>{implode(",",$module_info->admin_id)}</td>
+    <td>{implode(",",$module_info->admin_id)}&nbsp;</td>
 </tr>
 </table>
 
diff --git a/modules/document/tpl/document_list.html b/modules/document/tpl/document_list.html
index 3f2460cda..79fdf8339 100644
--- a/modules/document/tpl/document_list.html
+++ b/modules/document/tpl/document_list.html
@@ -39,8 +39,8 @@
         <tr>
             <td class="tahoma">{$no}</td>
             <td><input type="checkbox" name="cart" value="{$oDocument->document_srl}" /></td>
-            <td class="blue"><a href="{getUrl('','mid',$module_list[$oDocument->get('module_srl')]->mid)}" onclick="window.open(this.href);return false">{htmlspecialchars($module_list[$oDocument->get('module_srl')]->browser_title)}</a></td>
-            <td>
+            <td class="left blue"><a href="{getUrl('','mid',$module_list[$oDocument->get('module_srl')]->mid)}" onclick="window.open(this.href);return false">{htmlspecialchars($module_list[$oDocument->get('module_srl')]->browser_title)}</a></td>
+            <td class="left">
                 <a href="{getUrl('','document_srl',$oDocument->document_srl)}" onclick="window.open(this.href);return false">{$oDocument->getTitleText()}</a>
 
                 <!--@if($oDocument->getCommentCount())-->
@@ -51,7 +51,7 @@
                     [{$oDocument->getTrackbackCount()}]
                 <!--@end-->
             </td>
-            <td><div class="member_{$oDocument->get('member_srl')}">{$oDocument->getNickName()}</div></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>
diff --git a/modules/file/tpl/file_list.html b/modules/file/tpl/file_list.html
index e155df82f..9c2e539a0 100644
--- a/modules/file/tpl/file_list.html
+++ b/modules/file/tpl/file_list.html
@@ -39,8 +39,8 @@
     <tr>
         <td class="tahoma">{$no}</td>
         <td><input type="checkbox" name="cart" value="{$val->file_srl}" /></td>
-        <td class="blue"><a href="./?mid={$module_list[$val->module_srl]->mid}" onclick="window.open(this.href);return false;">{$module_list[$val->module_srl]->browser_title}</a></td>
-        <td class="red"><a href="{$val->download_url}">{htmlspecialchars($val->source_filename)}</a></td>
+        <td class="left blue"><a href="./?mid={$module_list[$val->module_srl]->mid}" onclick="window.open(this.href);return false;">{$module_list[$val->module_srl]->browser_title}</a></td>
+        <td class="left red"><a href="{$val->download_url}">{htmlspecialchars($val->source_filename)}</a></td>
         <td class="tahoma">{$val->file_size}</td>
         <td>
             <!--@if($val->isvalid=='Y')-->
diff --git a/modules/opage/tpl/index.html b/modules/opage/tpl/index.html
index cd054f988..21074c2fc 100644
--- a/modules/opage/tpl/index.html
+++ b/modules/opage/tpl/index.html
@@ -26,7 +26,7 @@
             <form action="./" method="get" onsubmit="return doChangeCategory(this);">
                 <input type="hidden" name="module" value="{$module}" />
                 <input type="hidden" name="act" value="{$act}" />
-                <select name="module_category_srl" class="w100">
+                <select name="module_category_srl" class="w80">
                     <option value="">{$lang->module_category}</option>
                     <!--@foreach($module_category as $key => $val)-->
                     <option value="{$key}" <!--@if($module_category_srl==$key)-->selected="selected"<!--@end-->>{$val->title}</option>
diff --git a/modules/page/tpl/index.html b/modules/page/tpl/index.html
index b9d70ad4b..566778b7b 100644
--- a/modules/page/tpl/index.html
+++ b/modules/page/tpl/index.html
@@ -26,7 +26,7 @@
             <form action="./" method="get" onsubmit="return doChangeCategory(this);">
                 <input type="hidden" name="module" value="{$module}" />
                 <input type="hidden" name="act" value="{$act}" />
-                <select name="module_category_srl" class="w100">
+                <select name="module_category_srl" class="w80">
                     <option value="">{$lang->module_category}</option>
                     <!--@foreach($module_category as $key => $val)-->
                     <option value="{$key}" <!--@if($module_category_srl==$key)-->selected="selected"<!--@end-->>{$val->title}</option>

From 6e3c2b4fb47feb805ef1e2668b24620119cc5ec5 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Wed, 10 Oct 2007 04:52:41 +0000
Subject: [PATCH 08/29] =?UTF-8?q?=ED=8F=AC=EC=9D=B8=ED=8A=B8=20=EB=AA=A8?=
 =?UTF-8?q?=EB=93=88=EC=97=90=20=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85?=
 =?UTF-8?q?=EC=8B=9C=20=ED=8F=AC=EC=9D=B8=ED=8A=B8=EB=A5=BC=20=EC=A4=84=20?=
 =?UTF-8?q?=EC=88=98=20=EC=9E=88=EB=8F=84=EB=A1=9D=20=EA=B8=B0=EB=8A=A5=20?=
 =?UTF-8?q?=EA=B0=9C=EC=84=A0?=
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@2718 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 addons/point/point.addon.php             | 15 ++++++++++++++
 modules/point/lang/en.lang.php           |  1 +
 modules/point/lang/es.lang.php           |  1 +
 modules/point/lang/jp.lang.php           |  1 +
 modules/point/lang/ko.lang.php           |  1 +
 modules/point/lang/zh-CN.lang.php        |  1 +
 modules/point/point.admin.controller.php |  7 +++++--
 modules/point/point.class.php            | 26 ++++++++++++++++++++++++
 modules/point/tpl/action_config.html     |  4 ++++
 modules/point/tpl/module_config.html     |  3 +++
 10 files changed, 58 insertions(+), 2 deletions(-)

diff --git a/addons/point/point.addon.php b/addons/point/point.addon.php
index 03c877f61..1f5460140 100644
--- a/addons/point/point.addon.php
+++ b/addons/point/point.addon.php
@@ -159,6 +159,21 @@
             $cur_point -= $point;
             $oPointController = &getController('point');
             $oPointController->setPoint($target_member_srl,$cur_point);
+
+        // 회원 가입일 경우
+        } elseif(strpos($config->signup_act,$this->act)!==false) {
+            // 가입이 제대로 되었는지 체크
+            if(!$this->toBool()||!$this->get('member_srl')) return;
+            $member_srl = $this->get('member_srl');
+
+            // 포인트를 구해옴
+            $point = $config->module_point[$module_srl]['signup'];
+            if($point == null) $point = $config->signup;
+
+            // 포인트 증감
+            $cur_point += $point;
+            $oPointController = &getController('point');
+            $oPointController->setPoint($member_srl,$cur_point);
         }
 
     // 파일다운로드는 before_module_proc 일때 체크
diff --git a/modules/point/lang/en.lang.php b/modules/point/lang/en.lang.php
index 2ca9ba4be..d86eed8ae 100644
--- a/modules/point/lang/en.lang.php
+++ b/modules/point/lang/en.lang.php
@@ -28,6 +28,7 @@
 
     $lang->about_module_point = "You can set point for each module and modules which don't have any value will use default point.<br />All point will be restored on acting reverse.";
 
+    $lang->point_signup = 'Signup';
     $lang->point_insert_document = 'On Writing';
     $lang->point_delete_document = 'On Deleting';
     $lang->point_insert_comment = 'On Adding Comments';
diff --git a/modules/point/lang/es.lang.php b/modules/point/lang/es.lang.php
index b66647b53..92ad02ab5 100644
--- a/modules/point/lang/es.lang.php
+++ b/modules/point/lang/es.lang.php
@@ -28,6 +28,7 @@
 
     $lang->about_module_point = "Usted puede definir los puntos para cada módulo y los módulos que no tengan ningun valor usarán punto predefinido.<br />Todos los puntos serán restituidos al actuar en forma contraria.";
 
+    $lang->point_signup = 'Fecha del';
     $lang->point_insert_document = 'Al escribir documento';
     $lang->point_delete_document = 'Al borrar documento';
     $lang->point_insert_comment = 'Al agregar comentarios';
diff --git a/modules/point/lang/jp.lang.php b/modules/point/lang/jp.lang.php
index d8d4aedb0..5d9820b23 100644
--- a/modules/point/lang/jp.lang.php
+++ b/modules/point/lang/jp.lang.php
@@ -28,6 +28,7 @@
 
     $lang->about_module_point = 'モジュール別にポイントを指定することができますが、指定されていないモジュールでは、デフォルトポイントが使用されます。すべてのポイント数は、反対のアクションを行った際には原状復帰されます。';
 
+    $lang->point_signup = '加入';
     $lang->point_insert_document = '書き込み作成';
     $lang->point_delete_document = '書き込み削除';
     $lang->point_insert_comment = 'コメント作成';
diff --git a/modules/point/lang/ko.lang.php b/modules/point/lang/ko.lang.php
index 1eb0c8bad..b602f8f90 100644
--- a/modules/point/lang/ko.lang.php
+++ b/modules/point/lang/ko.lang.php
@@ -28,6 +28,7 @@
 
     $lang->about_module_point = '모듈별로 포인트를 지정할 수 있으며 지정되지 않은 모듈은 기본 포인트를 이용하게 됩니다<br />모든 점수는 반대 행동을 하였을 경우 원상복귀 됩니다.';
 
+    $lang->point_signup = '가입';
     $lang->point_insert_document = '글 작성';
     $lang->point_delete_document = '글 삭제';
     $lang->point_insert_comment = '댓글 작성';
diff --git a/modules/point/lang/zh-CN.lang.php b/modules/point/lang/zh-CN.lang.php
index f80d3ae1b..ae482992f 100644
--- a/modules/point/lang/zh-CN.lang.php
+++ b/modules/point/lang/zh-CN.lang.php
@@ -28,6 +28,7 @@
 
     $lang->about_module_point = '可以分别对各模块进行积分设置，没有被设置的模块将使用默认值。<br />所有积分在相反动作下恢复原始值。即：发表新帖后再删除得到的积分为0分。';
 
+    $lang->point_signup = '注册';
     $lang->point_insert_document = '发表新帖';
     $lang->point_delete_document = '删除主题';
     $lang->point_insert_comment = '发表评论';
diff --git a/modules/point/point.admin.controller.php b/modules/point/point.admin.controller.php
index 2c0e0d312..7b41a43f0 100644
--- a/modules/point/point.admin.controller.php
+++ b/modules/point/point.admin.controller.php
@@ -61,13 +61,14 @@
             // 변수 정리
             $args = Context::getRequestVars();
 
+            $config->signup = (int)$args->signup;
             $config->insert_document = (int)$args->insert_document;
             $config->insert_comment = (int)$args->insert_comment;
             $config->upload_file = (int)$args->upload_file;
             $config->download_file = (int)$args->download_file;
 
             foreach($args as $key => $val) {
-                preg_match("/^(insert_document|insert_comment|upload_file|download_file)_([0-9]+)$/", $key, $matches);
+                preg_match("/^(signup|insert_document|insert_comment|upload_file|download_file)_([0-9]+)$/", $key, $matches);
                 if(!$matches[1]) continue;
                 $name = $matches[1];
                 $module_srl = $matches[2];
@@ -95,6 +96,7 @@
             // 변수 정리
             $args = Context::getRequestVars();
 
+            $config->signup_act = $args->signup_act;
             $config->insert_document_act = $args->insert_document_act;
             $config->delete_document_act = $args->delete_document_act;
             $config->insert_comment_act = $args->insert_comment_act;
@@ -132,7 +134,8 @@
             $config = $oModuleModel->getModuleConfig('point');
 
             // 각 act값을 정리
-            $act_list = sprintf("%s,%s,%s,%s,%s,%s,%s",
+            $act_list = sprintf("%s,%s,%s,%s,%s,%s,%s,%s",
+                    $config->signup_act,
                     $config->insert_document_act,
                     $config->delete_document_act,
                     $config->insert_comment_act,
diff --git a/modules/point/point.class.php b/modules/point/point.class.php
index c0814c786..e09766a9c 100644
--- a/modules/point/point.class.php
+++ b/modules/point/point.class.php
@@ -43,6 +43,11 @@
             /**
              * 모듈별 기본 점수 및 각 action 정의 (게시판,블로그외에 어떤 모듈이 생길지 모르니 act값을 명시한다
              **/
+            // 회원가입
+            $config->signup = 10;
+
+            $config->signup_act = 'procMemberInsert';
+
             // 글작성
             $config->insert_document = 10;
 
@@ -79,6 +84,12 @@
          * @brief 설치가 이상이 없는지 체크하는 method
          **/
         function checkUpdate() {
+            // point 모듈 정보 가져옴
+            $oModuleModel = &getModel('module');
+            $config = $oModuleModel->getModuleConfig('point');
+
+            if(!$config->signup || !$config->signup_act) return true;
+
             return false;
         }
 
@@ -86,6 +97,21 @@
          * @brief 업데이트 실행
          **/
         function moduleUpdate() {
+            // point 모듈 정보 가져옴
+            $oModuleModel = &getModel('module');
+            $config = $oModuleModel->getModuleConfig('point');
+
+            if(!$config->signup || !$config->signup_act) {
+                $config->signup = 10;
+                $config->signup_act = 'procMemberInsert';
+
+                $oModuleController = &getController('module');
+                $oModuleController->insertModuleConfig('point', $config);
+
+                $oPointController = &getAdminController('point');
+                $oPointController->cacheActList();
+            }
+
             return new Object(0, 'success_updated');
         }
 
diff --git a/modules/point/tpl/action_config.html b/modules/point/tpl/action_config.html
index 9d571c0db..dcbb1a995 100644
--- a/modules/point/tpl/action_config.html
+++ b/modules/point/tpl/action_config.html
@@ -7,6 +7,10 @@
     <table cellspacing="0" class="tableType2 gap1">
     <col width="200" />
     <col />
+    <tr>
+        <th>{$lang->point_signup}</th>
+        <td><input type="text" name="signup_act" value="{$config->signup_act}" class="inputTypeText w100" /></td>
+    </tr>
     <tr>
         <th>{$lang->point_insert_document}</th>
         <td><input type="text" name="insert_document_act" value="{$config->insert_document_act}" class="inputTypeText w100" /></td>
diff --git a/modules/point/tpl/module_config.html b/modules/point/tpl/module_config.html
index 0741b5f70..e398f8f7e 100644
--- a/modules/point/tpl/module_config.html
+++ b/modules/point/tpl/module_config.html
@@ -7,6 +7,7 @@
     <table cellspacing="0" class="tableType2 gap1">
     <tr>
         <th>&nbsp;</th>
+        <th>{$lang->point_signup}</th>
         <th>{$lang->point_insert_document}</th>
         <th>{$lang->point_insert_comment}</th>
         <th>{$lang->point_upload_file}</th>
@@ -14,6 +15,7 @@
     </tr>
     <tr>
         <th scope="col">{$lang->is_default}</th>
+        <td><input type="text" name="signup" value="{$config->signup}" class="inputTypeText w80" /> {$config->point_name}</td>
         <td><input type="text" name="insert_document" value="{$config->insert_document}" class="inputTypeText w80" /> {$config->point_name}</td>
         <td><input type="text" name="insert_comment" value="{$config->insert_comment}" class="inputTypeText w80" /> {$config->point_name}</td>
         <td><input type="text" name="upload_file" value="{$config->upload_file}" class="inputTypeText w80" /> {$config->point_name}</td>
@@ -22,6 +24,7 @@
     <!--@foreach($mid_list as $key => $val)-->
     <tr>
         <th scope="col">{$val->browser_title} ({$val->mid})</th>
+        <td><input type="text" name="signup_{$val->module_srl}" value="{$config->module_point[$val->module_srl]['signup']}" class="inputTypeText w80" /> {$config->point_name}</td>
         <td><input type="text" name="insert_document_{$val->module_srl}" value="{$config->module_point[$val->module_srl]['insert_document']}" class="inputTypeText w80" /> {$config->point_name}</td>
         <td><input type="text" name="insert_comment_{$val->module_srl}" value="{$config->module_point[$val->module_srl]['insert_comment']}" class="inputTypeText w80" /> {$config->point_name}</td>
         <td><input type="text" name="upload_file_{$val->module_srl}" value="{$config->module_point[$val->module_srl]['upload_file']}" class="inputTypeText w80" /> {$config->point_name}</td>

From c922dc5b209b5c20cd350bf1605cfc9c4a1dfd41 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Wed, 10 Oct 2007 06:41:24 +0000
Subject: [PATCH 09/29] =?UTF-8?q?=EB=B8=94=EB=A1=9C=EA=B7=B8/=EA=B2=8C?=
 =?UTF-8?q?=EC=8B=9C=ED=8C=90=EC=9D=98=20=EA=B8=B0=EB=B3=B8=20=EC=8A=A4?=
 =?UTF-8?q?=ED=82=A8=EC=97=90=20=EC=9E=91=EC=84=B1=EC=9E=90(=EA=B8=80,?=
 =?UTF-8?q?=EB=8C=93=EA=B8=80)=EA=B0=80=20=EB=B9=84=ED=9A=8C=EC=9B=90?=
 =?UTF-8?q?=EC=9D=BC=20=EA=B2=BD=EC=9A=B0=20=ED=99=88=ED=8E=98=EC=9D=B4?=
 =?UTF-8?q?=EC=A7=80=20=EB=A7=81=ED=81=AC=20=EC=A0=81=EC=9A=A9?=
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@2719 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/blog/skins/xe_blog/comment.html        | 12 +++++++++++-
 modules/blog/skins/xe_blog/css/common.css      |  2 +-
 modules/board/skins/xe_gallery/comment.html    | 12 +++++++++++-
 modules/board/skins/xe_gallery/css/common.css  | 13 +++++++------
 .../board/skins/xe_gallery/view_document.html  | 13 ++++++++++++-
 modules/board/skins/xe_list/comment.html       | 12 +++++++++++-
 modules/board/skins/xe_list/css/common.css     | 15 ++++++++-------
 modules/board/skins/xe_list/view_document.html | 13 ++++++++++++-
 modules/board/skins/xe_webzine/comment.html    | 12 +++++++++++-
 modules/board/skins/xe_webzine/css/common.css  | 13 +++++++------
 .../board/skins/xe_webzine/view_document.html  | 13 ++++++++++++-
 modules/document/document.item.php             | 18 ++++++++++++++++++
 12 files changed, 121 insertions(+), 27 deletions(-)

diff --git a/modules/blog/skins/xe_blog/comment.html b/modules/blog/skins/xe_blog/comment.html
index c1843601e..18bd4435e 100644
--- a/modules/blog/skins/xe_blog/comment.html
+++ b/modules/blog/skins/xe_blog/comment.html
@@ -27,7 +27,17 @@
                 <!--@end-->
             </div>
 
-            <div class="member_{$val->member_srl} author">{htmlspecialchars($val->nick_name)}</div>
+            <div class="author">
+            <!--@if(!$val->member_srl)-->
+                <!--@if($val->homepage)-->
+                    <a href="{$val->homepage}" onclick="window.open(this.href);return false;">{htmlspecialchars($val->nick_name)}</a>
+                <!--@else-->
+                    {htmlspecialchars($val->nick_name)}
+                <!--@end-->
+            <!--@else-->
+                <div class="member_{$val->member_srl}">{htmlspecialchars($val->nick_name)}</div>
+            <!--@end-->
+            </div>
 
             <div class="replyContent">
             {$val->content}
diff --git a/modules/blog/skins/xe_blog/css/common.css b/modules/blog/skins/xe_blog/css/common.css
index b4b3931c8..5af0f2eec 100644
--- a/modules/blog/skins/xe_blog/css/common.css
+++ b/modules/blog/skins/xe_blog/css/common.css
@@ -219,7 +219,7 @@ ul.replyZone .replyIndent { background:url(../images/common/iconReplyArrow.gif)
 #reply li { padding:.6em .8em .6em .6em; line-height:1.25em; clear:both; border-bottom:1px dotted #EEEEEE; list-style:none;}
 #reply p { display:inline; margin-bottom:1em;}
 #reply .author { float:left; padding:0 .3em 0 0; font-size:.9em; color:#3074a5; margin:0 .3em .5em 0;}
-#reply .author a { font-size:.9em; color:#3074a5; margin-right:.3em;}
+#reply .author a { color:#3074a5; margin-right:.3em; text-decoration:none;}
 #reply .date { float:right; font:.8em Tahoma; color:#cccccc; margin:.3em 0 .5em 0;}
 
 #reply .replyOption { float:right; white-space:nowrap; margin-left:.2em;}
diff --git a/modules/board/skins/xe_gallery/comment.html b/modules/board/skins/xe_gallery/comment.html
index 8b5cad416..cd417315e 100644
--- a/modules/board/skins/xe_gallery/comment.html
+++ b/modules/board/skins/xe_gallery/comment.html
@@ -25,7 +25,17 @@
                 <!--@end-->
             </div>
 
-            <div class="author"><div class="member_{$val->member_srl}">{htmlspecialchars($val->nick_name)}</div></div>
+            <div class="author">
+            <!--@if(!$val->member_srl)-->
+                <!--@if($val->homepage)-->
+                    <a href="{$val->homepage}" onclick="window.open(this.href);return false;">{htmlspecialchars($val->nick_name)}</a>
+                <!--@else-->
+                    {htmlspecialchars($val->nick_name)}
+                <!--@end-->
+            <!--@else-->
+                <div class="member_{$val->member_srl}">{htmlspecialchars($val->nick_name)}</div>
+            <!--@end-->
+            </div>
 
             <div class="replyContent">
             {$val->content}
diff --git a/modules/board/skins/xe_gallery/css/common.css b/modules/board/skins/xe_gallery/css/common.css
index aff79c616..d391c537d 100644
--- a/modules/board/skins/xe_gallery/css/common.css
+++ b/modules/board/skins/xe_gallery/css/common.css
@@ -102,7 +102,7 @@ Jeong, Chan Myeong 070601~070630
 .pageNavigation a.goToLast img { display:inline-block; padding:2px 0; position:relative; top:2px; _top:1px;}
 
 /* extraVars list */
-.extraVarsList { width:100%; border:1px solid #e0e1db; clear:both; margin-bottom:1em;}
+.extraVarsList { width:100%; border:1px solid #e0e1db; clear:both; margin-bottom:1em; margin-top:1em;}
 .extraVarsList tr.notice { background:#f8f8f8;}
 .extraVarsList tr.notice .num { font-size:.9em; font-weight:bold;}
 .extraVarsList tr.bg1 { background:#ffffff}
@@ -138,12 +138,13 @@ Jeong, Chan Myeong 070601~070630
 .boardRead ul.uri { overflow:hidden; margin:0 0 2em .3em; float:right; clear:left;}
 .boardRead ul.uri li { font-size:8pt; color:#c5c7c0; }
 
-.boardRead .userInfo { float:left; white-space:nowrap;}
-.boardRead .userInfo .author { padding:0 .3em 0 0; color:#3074a5; margin-right:.3em;}
-.boardRead .userInfo .ipaddress { font-size:.9em; font-family:Tahoma; color:#888888; margin-right:.5em; }
+.boardRead .userInfo { float:left; white-space:nowrap; }
+.boardRead .userInfo .author { color:#3074a5; }
+.boardRead .userInfo .author a { font-size:.9em; color:#3074a5; text-decoration:none; }
+.boardRead .userInfo .ipaddress { font-size:.9em; color:#AAAAAA;  margin-top:.3em;}
 
 .boardRead .contentBody { width:100%; overflow:hidden; }
-.boardRead .readBody { padding:0 .3em; color:#555555; overflow:hidden; margin-bottom:2em; clear:both; }
+.boardRead .readBody { padding:0 .3em; color:#555555; overflow:hidden; margin-bottom:2em; clear:both; margin-top:2em;}
 .boardRead .readBody p { margin:1em 0; line-height:1.5em;}
 .boardRead .readBody .alignLeft { float:left; margin:0 1em 1em 0; }
 .boardRead .readBody .alignRight { float:right; margin:0 0 1em 1em; }
@@ -191,7 +192,7 @@ Jeong, Chan Myeong 070601~070630
 #reply li { padding:.6em .8em .6em .6em; line-height:1.25em; clear:both; border-bottom:1px dotted #EEEEEE; list-style:none;}
 #reply p { display:inline; margin-bottom:1em;}
 #reply .author { float:left; padding:0 .3em 0 0; font-size:.9em; color:#3074a5; margin:0 .3em .5em 0;}
-#reply .author a { font-size:.9em; color:#3074a5; margin-right:.3em;}
+#reply .author a { color:#3074a5; margin-right:.3em; text-decoration:none; }
 #reply .date { float:right; font:.8em Tahoma; color:#cccccc; margin:.3em 0 .5em 0;}
 
 #reply .replyOption { float:right; white-space:nowrap; margin-left:.2em;}
diff --git a/modules/board/skins/xe_gallery/view_document.html b/modules/board/skins/xe_gallery/view_document.html
index 9d75a65f7..950536cc2 100644
--- a/modules/board/skins/xe_gallery/view_document.html
+++ b/modules/board/skins/xe_gallery/view_document.html
@@ -44,7 +44,18 @@
         </ul>
 
         <div class="userInfo">
-            <div class="author member_{$oDocument->get('member_srl')}">{$oDocument->getNickName()}</div>
+            <!--@if(!$oDocument->getMemberSrl())-->
+                <div class="author">
+                <!--@if($oDocument->isExistsHomepage())-->
+                    <a href="{$oDocument->getHomepageUrl()}" onclick="window.open(this.href);return false;">{$oDocument->getNickName()}</a>
+                <!--@else-->
+                    {$oDocument->getNickName()}
+                <!--@end-->
+                </div>
+            <!--@else-->
+                <div class="author"><div class="member_{$oDocument->get('member_srl')}">{$oDocument->getNickName()}</div></div>
+            <!--@end-->
+
             <!--@if($grant->is_admin)-->
             <div class="ipaddress">{$oDocument->get('ipaddress')}</div>
             <!--@end-->
diff --git a/modules/board/skins/xe_list/comment.html b/modules/board/skins/xe_list/comment.html
index 8b5cad416..cd417315e 100644
--- a/modules/board/skins/xe_list/comment.html
+++ b/modules/board/skins/xe_list/comment.html
@@ -25,7 +25,17 @@
                 <!--@end-->
             </div>
 
-            <div class="author"><div class="member_{$val->member_srl}">{htmlspecialchars($val->nick_name)}</div></div>
+            <div class="author">
+            <!--@if(!$val->member_srl)-->
+                <!--@if($val->homepage)-->
+                    <a href="{$val->homepage}" onclick="window.open(this.href);return false;">{htmlspecialchars($val->nick_name)}</a>
+                <!--@else-->
+                    {htmlspecialchars($val->nick_name)}
+                <!--@end-->
+            <!--@else-->
+                <div class="member_{$val->member_srl}">{htmlspecialchars($val->nick_name)}</div>
+            <!--@end-->
+            </div>
 
             <div class="replyContent">
             {$val->content}
diff --git a/modules/board/skins/xe_list/css/common.css b/modules/board/skins/xe_list/css/common.css
index ba6fe9d05..2b2068fb6 100644
--- a/modules/board/skins/xe_list/css/common.css
+++ b/modules/board/skins/xe_list/css/common.css
@@ -102,7 +102,7 @@ Jeong, Chan Myeong 070601~070630
 .pageNavigation a.goToLast img { display:inline-block; padding:2px 0; position:relative; top:2px; _top:1px;}
 
 /* extraVars list */
-.extraVarsList { width:100%; border:1px solid #e0e1db; clear:both; margin-bottom:1em;}
+.extraVarsList { width:100%; border:1px solid #e0e1db; clear:both; margin-bottom:1em; margin-top:1em;}
 .extraVarsList tr.notice { background:#f8f8f8;}
 .extraVarsList tr.notice .num { font-size:.9em; font-weight:bold;}
 .extraVarsList tr.bg1 { background:#ffffff}
@@ -135,15 +135,16 @@ Jeong, Chan Myeong 070601~070630
 .boardRead .dateAndModify { float:right; white-space:nowrap; font-size:.8em; color:#999999;  position:relative;}
 .boardRead .dateAndModify strong { font-size:1em; font-family:Tahoma;}
 
-.boardRead ul.uri { overflow:hidden; margin:0 0 2em .3em; float:right; clear:left;}
+.boardRead ul.uri { overflow:hidden; margin:0 0 2em .3em; float:right; clear:left; }
 .boardRead ul.uri li { font-size:8pt; color:#c5c7c0; }
 
-.boardRead .userInfo { float:left; white-space:nowrap;}
-.boardRead .userInfo .author { padding:0 .3em 0 0; color:#3074a5; margin-right:.3em;}
-.boardRead .userInfo .ipaddress { font-size:.9em; font-family:Tahoma; color:#888888; margin-right:.5em; }
+.boardRead .userInfo { float:left; white-space:nowrap; }
+.boardRead .userInfo .author { color:#3074a5; }
+.boardRead .userInfo .author a { font-size:.9em; color:#3074a5; text-decoration:none; }
+.boardRead .userInfo .ipaddress { font-size:.9em; color:#AAAAAA;  margin-top:.3em;}
 
 .boardRead .contentBody { width:100%; overflow:hidden; }
-.boardRead .readBody { padding:0 .3em; color:#555555; overflow:hidden; margin-bottom:2em; clear:both; }
+.boardRead .readBody { padding:0 .3em; color:#555555; overflow:hidden; margin-bottom:2em; clear:both; margin-top:2em;}
 .boardRead .readBody p { margin:1em 0; line-height:1.5em;}
 .boardRead .readBody .alignLeft { float:left; margin:0 1em 1em 0; }
 .boardRead .readBody .alignRight { float:right; margin:0 0 1em 1em; }
@@ -191,7 +192,7 @@ Jeong, Chan Myeong 070601~070630
 #reply li { padding:.6em .8em .6em .6em; line-height:1.25em; clear:both; border-bottom:1px dotted #EEEEEE; list-style:none;}
 #reply p { display:inline; margin-bottom:1em;}
 #reply .author { float:left; padding:0 .3em 0 0; font-size:.9em; color:#3074a5; margin:0 .3em .5em 0;}
-#reply .author a { font-size:.9em; color:#3074a5; margin-right:.3em;}
+#reply .author a { color:#3074a5; margin-right:.3em; text-decoration:none; }
 #reply .date { float:right; font:.8em Tahoma; color:#cccccc; margin:.3em 0 .5em 0;}
 
 #reply .replyOption { float:right; white-space:nowrap; margin-left:.2em;}
diff --git a/modules/board/skins/xe_list/view_document.html b/modules/board/skins/xe_list/view_document.html
index 9d75a65f7..950536cc2 100644
--- a/modules/board/skins/xe_list/view_document.html
+++ b/modules/board/skins/xe_list/view_document.html
@@ -44,7 +44,18 @@
         </ul>
 
         <div class="userInfo">
-            <div class="author member_{$oDocument->get('member_srl')}">{$oDocument->getNickName()}</div>
+            <!--@if(!$oDocument->getMemberSrl())-->
+                <div class="author">
+                <!--@if($oDocument->isExistsHomepage())-->
+                    <a href="{$oDocument->getHomepageUrl()}" onclick="window.open(this.href);return false;">{$oDocument->getNickName()}</a>
+                <!--@else-->
+                    {$oDocument->getNickName()}
+                <!--@end-->
+                </div>
+            <!--@else-->
+                <div class="author"><div class="member_{$oDocument->get('member_srl')}">{$oDocument->getNickName()}</div></div>
+            <!--@end-->
+
             <!--@if($grant->is_admin)-->
             <div class="ipaddress">{$oDocument->get('ipaddress')}</div>
             <!--@end-->
diff --git a/modules/board/skins/xe_webzine/comment.html b/modules/board/skins/xe_webzine/comment.html
index 8b5cad416..cd417315e 100644
--- a/modules/board/skins/xe_webzine/comment.html
+++ b/modules/board/skins/xe_webzine/comment.html
@@ -25,7 +25,17 @@
                 <!--@end-->
             </div>
 
-            <div class="author"><div class="member_{$val->member_srl}">{htmlspecialchars($val->nick_name)}</div></div>
+            <div class="author">
+            <!--@if(!$val->member_srl)-->
+                <!--@if($val->homepage)-->
+                    <a href="{$val->homepage}" onclick="window.open(this.href);return false;">{htmlspecialchars($val->nick_name)}</a>
+                <!--@else-->
+                    {htmlspecialchars($val->nick_name)}
+                <!--@end-->
+            <!--@else-->
+                <div class="member_{$val->member_srl}">{htmlspecialchars($val->nick_name)}</div>
+            <!--@end-->
+            </div>
 
             <div class="replyContent">
             {$val->content}
diff --git a/modules/board/skins/xe_webzine/css/common.css b/modules/board/skins/xe_webzine/css/common.css
index c21f59c63..e5488c79b 100644
--- a/modules/board/skins/xe_webzine/css/common.css
+++ b/modules/board/skins/xe_webzine/css/common.css
@@ -109,7 +109,7 @@ Jeong, Chan Myeong 070601~070630
 .pageNavigation a.goToLast img { display:inline-block; padding:2px 0; position:relative; top:2px; _top:1px;}
 
 /* extraVars list */
-.extraVarsList { width:100%; border:1px solid #e0e1db; clear:both; margin-bottom:1em;}
+.extraVarsList { width:100%; border:1px solid #e0e1db; clear:both; margin-bottom:1em; margin-top:1em;}
 .extraVarsList tr.notice { background:#f8f8f8;}
 .extraVarsList tr.notice .num { font-size:.9em; font-weight:bold;}
 .extraVarsList tr.bg1 { background:#ffffff}
@@ -145,12 +145,13 @@ Jeong, Chan Myeong 070601~070630
 .boardRead ul.uri { overflow:hidden; margin:0 0 2em .3em; float:right; clear:left;}
 .boardRead ul.uri li { font-size:8pt; color:#c5c7c0; }
 
-.boardRead .userInfo { float:left; white-space:nowrap;}
-.boardRead .userInfo .author { padding:0 .3em 0 0; color:#3074a5; margin-right:.3em;}
-.boardRead .userInfo .ipaddress { font-size:.9em; font-family:Tahoma; color:#888888; margin-right:.5em; }
+.boardRead .userInfo { float:left; white-space:nowrap; }
+.boardRead .userInfo .author { color:#3074a5; }
+.boardRead .userInfo .author a { font-size:.9em; color:#3074a5; text-decoration:none; }
+.boardRead .userInfo .ipaddress { font-size:.9em; color:#AAAAAA;  margin-top:.3em;}
 
 .boardRead .contentBody { width:100%; overflow:hidden; }
-.boardRead .readBody { padding:0 .3em; color:#555555; overflow:hidden; margin-bottom:2em; clear:both; }
+.boardRead .readBody { padding:0 .3em; color:#555555; overflow:hidden; margin-bottom:2em; clear:both; margin-top:2em;}
 .boardRead .readBody p { margin:1em 0; line-height:1.5em;}
 .boardRead .readBody .alignLeft { float:left; margin:0 1em 1em 0; }
 .boardRead .readBody .alignRight { float:right; margin:0 0 1em 1em; }
@@ -198,7 +199,7 @@ Jeong, Chan Myeong 070601~070630
 #reply li { padding:.6em .8em .6em .6em; line-height:1.25em; clear:both; border-bottom:1px dotted #EEEEEE; list-style:none;}
 #reply p { display:inline; margin-bottom:1em;}
 #reply .author { float:left; padding:0 .3em 0 0; font-size:.9em; color:#3074a5; margin:0 .3em .5em 0;}
-#reply .author a { font-size:.9em; color:#3074a5; margin-right:.3em;}
+#reply .author a { color:#3074a5; margin-right:.3em; text-decoration:none; }
 #reply .date { float:right; font:.8em Tahoma; color:#cccccc; margin:.3em 0 .5em 0;}
 
 #reply .replyOption { float:right; white-space:nowrap; margin-left:.2em;}
diff --git a/modules/board/skins/xe_webzine/view_document.html b/modules/board/skins/xe_webzine/view_document.html
index 9d75a65f7..950536cc2 100644
--- a/modules/board/skins/xe_webzine/view_document.html
+++ b/modules/board/skins/xe_webzine/view_document.html
@@ -44,7 +44,18 @@
         </ul>
 
         <div class="userInfo">
-            <div class="author member_{$oDocument->get('member_srl')}">{$oDocument->getNickName()}</div>
+            <!--@if(!$oDocument->getMemberSrl())-->
+                <div class="author">
+                <!--@if($oDocument->isExistsHomepage())-->
+                    <a href="{$oDocument->getHomepageUrl()}" onclick="window.open(this.href);return false;">{$oDocument->getNickName()}</a>
+                <!--@else-->
+                    {$oDocument->getNickName()}
+                <!--@end-->
+                </div>
+            <!--@else-->
+                <div class="author"><div class="member_{$oDocument->get('member_srl')}">{$oDocument->getNickName()}</div></div>
+            <!--@end-->
+
             <!--@if($grant->is_admin)-->
             <div class="ipaddress">{$oDocument->get('ipaddress')}</div>
             <!--@end-->
diff --git a/modules/document/document.item.php b/modules/document/document.item.php
index 79acc18ea..1b2315ce8 100644
--- a/modules/document/document.item.php
+++ b/modules/document/document.item.php
@@ -122,6 +122,24 @@
             $oMemberController = &getController('member');
             $oMemberController->sendMessage($sender_member_srl, $receiver_srl, $title, $content, false);
         }
+
+        function isExistsHomepage() {
+            if(trim($this->get('homepage'))) return true;
+            return false;
+        }
+
+        function getHomepageUrl() {
+            $url = trim($this->get('homepage'));
+            if(!$url) return;
+
+            if(!eregi("^http:\/\/",$url)) $url = "http://".$url;
+
+            return $url;
+        }
+
+        function getMemberSrl() {
+            return $this->get('member_srl');
+        }
         
         function getUserID() {
             return htmlspecialchars($this->get('user_id'));

From c36aa645d6d684a82e570667c22f9bdc08024ec0 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Wed, 10 Oct 2007 06:48:28 +0000
Subject: [PATCH 10/29] =?UTF-8?q?=EA=B2=8C=EC=8B=9C=EA=B8=80=EC=9D=98=20?=
 =?UTF-8?q?=EC=9D=B4=EB=AF=B8=EC=A7=80/=EB=AC=B4=EB=B9=84=20=EC=95=84?=
 =?UTF-8?q?=EC=9D=B4=EC=BD=98=20=EB=B3=80=EA=B2=BD=20=EB=B0=8F=20=EC=9C=84?=
 =?UTF-8?q?=EC=B9=98=EB=8F=84=20=EB=B3=80=EA=B2=BD?=
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@2720 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/document/document.item.php   |  27 ++++++++++++++-------------
 modules/document/tpl/icons/image.gif | Bin 522 -> 211 bytes
 modules/document/tpl/icons/movie.gif | Bin 524 -> 343 bytes
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/modules/document/document.item.php b/modules/document/document.item.php
index 1b2315ce8..57cb9b3c1 100644
--- a/modules/document/document.item.php
+++ b/modules/document/document.item.php
@@ -363,21 +363,11 @@
          * @brief 새글, 최신 업데이트글, 비밀글, 이미지/동영상/첨부파일등의 아이콘 출력용 함수
          * $time_interval 에 지정된 시간(초)로 새글/최신 업데이트글의 판별
          **/
-        function getExtraImages($time_interval = 7200) {
+        function getExtraImages($time_interval = 43200) {
 
             // 아이콘 목록을 담을 변수 미리 설정
             $buffs = array();
 
-            // 최신 시간 설정
-            $time_check = date("YmdHis", time()-$time_interval);
-
-            // 새글 체크
-            if($this->get('regdate')>$time_check) $buffs[] = "new";
-            else if($this->get('last_update')>$time_check) $buffs[] = "update";
-
-            // 비밀글 체크
-            if($this->isSecret()) $buffs[] = "secret";
-
             $check_files = false;
 
             // 사진 이미지 체크
@@ -395,13 +385,24 @@
             // 첨부파일 체크
             if(!$check_files && $this->hasUploadedFiles()) $buffs[] = "file";
 
+            // 비밀글 체크
+            if($this->isSecret()) $buffs[] = "secret";
+
+            // 최신 시간 설정
+            $time_check = date("YmdHis", time()-$time_interval);
+
+            // 새글 체크
+            if($this->get('regdate')>$time_check) $buffs[] = "new";
+            else if($this->get('last_update')>$time_check) $buffs[] = "update";
+
+
             return $buffs;
         }
         
         /**
          * @brief getExtraImages로 구한 값을 이미지 태그를 씌워서 리턴
          **/
-        function printExtraImages($time_check = 7200) {
+        function printExtraImages($time_check = 43200) {
             // 아이콘 디렉토리 구함
             $path = sprintf('%s%s',getUrl(), 'modules/document/tpl/icons/');
 
@@ -410,7 +411,7 @@
 
             $buff = null;
             foreach($buffs as $key => $val) {
-                $buff .= sprintf('<img src="%s%s.gif" alt="%s" title="%s" width="13" height="13" align="absmiddle"/>', $path, $val, $val, $val);
+                $buff .= sprintf('<img src="%s%s.gif" alt="%s" title="%s" align="absmiddle"/>', $path, $val, $val, $val);
             }
             return $buff;
         }
diff --git a/modules/document/tpl/icons/image.gif b/modules/document/tpl/icons/image.gif
index d26dd575c2dd846b64153ba90a7e0399aca3c282..128454cb7dd9b367f383e75d96761b164cc36840 100644
GIT binary patch
literal 211
zcmZ?wbhEHb<YVAvI3mEX^U0s)Bb+g_xp%+$JNW~{vYUTSzx)%tmf`i+f9cyrCf)p3
zcbUOz0z>toca@cu|G|KP6rlK%g^__lfI$bO31lY&Yk<O&o)pV2|5fW={xB)fvCms9
z!a9M^%h_6=^+1Ee5}tjtnht8nO+LWZydgu0hxNr{1K$GPhI{V?7w8F{X}S?=H-BgL
Uf`o_PingxV<DBx!*@?j#0Q4nFL;wH)

literal 522
zcmZ?wbhEHb<YnMxc;?2CI+L+!dq%}N=83zvFSx*vF_U5D8RObro74T3XP#o1bISPN
z|GzU!U1yv&GN12I-0EIBEl{>zYSo!v?h_c^ettUP<iEw|Kh53~xZtu_duvGZD)XjY
z%n$Ay>^t&eZd%}kgJB8v){~CiD-I8ydB!kpLx0U$he&tDwI^<FId%WnpYIDVGtEBp
zCA6DCx>9lWDTkC=OP_@S6?2(pT)H;#;L&T3cl4aRmol5FV&CS-sZ45f6z86P(|@@x
zJfE>*gY$=fPx<Q^j5-)6T%NG;V&BXQ!oMEB{0{~ULkB4SWMO1raAVK`IT;iu4D9I*
zZcWWCt!-_ton76oO|DjovbKx@%-W{CZm#O8@)DdDIvS!gUD=tmSfuS$#DtbI8tXYT
z2@CR>FSWKYG_us^chFrbF2!S@ASdbQv{cj1g+ockgj-}OFP9mE8Y_b`+tQw%_Vz{w
FYXCc9lb`?q

diff --git a/modules/document/tpl/icons/movie.gif b/modules/document/tpl/icons/movie.gif
index 8cb4c950f94c2da80fb4d00f03ab22981fefdeee..104abed57a999185c9269658f1a3e11a040d764c 100644
GIT binary patch
literal 343
zcmZ?wbhEHb<YnMvxN6Ms^Vjcx|NbQvHYOD`q?C0f7q={4y(PJ%ExEKKwX*LAQ2NiG
zZ$Ex6-Fz^qsQJ^EZ)w$&|Ni~={^OSqpT9nO_WIHD*MI)}{qptu-+%u;e*XIM&4+*g
z{=fV98K~{^*YAJ+{{8j)_v?2bzkdJm_1ljRpT69E^t|`@_y3Ff5)118yUI!Tzti8x
zvhaVC%YRnkti5Tq(~=76HyKO(2LlEofZ|UUMg|6B1|5)Eke?XXN)F5{Xp<6a_gG{!
z(?&^p{fd%bSq>?id=-)+8yL9QR1~{shG$H#nxepxv|Knl&uFI&3k#dx^4szp?DB@1
zn!4>;T6)6ltlTYa9bH1Ke6kbTbvyMG`Is2e3^TN|^hBAM6P3jIB~@gkL{ypC47P3G
KVZi3dU=0A3I-D~A

literal 524
zcmZ?wbhEHb<YnMxcoxKvmKbMjtQi>M>Fn&B6f98`<LcyWJEhMdDKS1VLOeJ)xUsRc
ztGg{MG`PLJ{rUOT2~i61aZ#uC&DeKreo91CTs+gc69KiE+3`MZS5GcnGST<zL!T3S
zTrOX13kwUob!Psf^A|JXSf5?L^!E1L(>r7mqj_K6yA=~1{`ATmH!sidh@gVP?BdM$
zr1%H}0}Ur9Cv$V%h=_>y_W}$J)nDA3?&0p693Phy#&_e8oSwec(M{e3*%|36`p<69
zzI*muV31dAZ0xi?=lsOP6Z<1-YpWx@?L4g+uAZ8blFaGmW^?ISO>;|Ga&$ytZ2alt
zDcR{M_V%_Z@v8s-|7RE+K=CIFBLhPagAT|!pg3V*&uj>4YHn$5Ywysq>}X=s=4sb6
zW(;uAZ;~@~u=h0J_U7YaZW6KcRWo&ylob|YZQ>PF*VQzacXXDvXfk84_F+<VXZJHw
pX>w8!SCU{+ma>u&YvS-{&~fE7@#5F8ZMO*&Q1uY)X>DY%1^~;2kKO<P


From 855926dbdb51971f05e94c854324b241672ea14a Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Wed, 10 Oct 2007 06:49:23 +0000
Subject: [PATCH 11/29] =?UTF-8?q?file=20=EC=95=84=EC=9D=B4=EC=BD=98=20?=
 =?UTF-8?q?=EB=88=84=EB=9D=BD=EB=90=9C=20=EA=B2=83=20commit?=
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@2721 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/document/tpl/icons/file.gif | Bin 545 -> 146 bytes
 1 file changed, 0 insertions(+), 0 deletions(-)

diff --git a/modules/document/tpl/icons/file.gif b/modules/document/tpl/icons/file.gif
index b57c1b9121e3a6fbb9196bf27aa0287661747efc..c39a49aa0041c443294864ff91d0aaddc882daf0 100644
GIT binary patch
literal 146
zcmZ?wbhEHb<YnMt*v!SSaPhQdOC~K^I(^E7^nKf_6H^1GO$>bf^4kCZ|8HJd3nUp(
zf#OdVMg|5h1|5(v$P5M+`+!c*)d32UM=BlJ3{#@7w<a%=%<=AM);j-6K;319aH-D>
k**L{C3yFSq=cEp2xmK6ufhV6_EI93uc>1jvlOTgN08rdB@Bjb+

literal 545
zcmZ?wbhEHb<YnMxc$UU+MS;OMeL;41ZeCuVL)IkAqy<@7Iq&}ce_K`jdg)B(=<fG5
zrT_o`cgR@#@87?fTQ2?l`BN`>YH(6_Lhp%&6;D5|oNbfVm!Dgd)PE|ipmOWht>y^}
zCTzSiVe{Qhn>IOS^e;MeJ0_!K`|&HwmaT{^ng4v@)b#3kiKWw~Y`gPwQJZf1^vt$R
zF*Qps%QMt1xNvyW70=B6`k8yI(x#imEy>Nz&&kO%i<)AXI&Z(MltIo!r>M5Q3jBd7
zEsc%MC9Mmuh_eJI*XEa0<rmkP#LnNjbNAoBf0u4PmsB>}A#>`>AOBlg+V0dBd|f%y
zJb8k1(!|P{C(`q)UM!kc(Yg5lzyA;W8?(ymzs;Z8yy)D;x~h!AhWz~eHEY)76qcUe
zdp)XPYDRvkMe2eVrFoYm7y=5Hn8we3(NzZw4F>7~#h)yU3=C-uIv^uKal*h}*O1oK
z+|t_CZfRh~$Y{<b<lD@m6q3r#k?0-a=FyZ8Yn{ZvplffTZ`7ovAR49`$f@bWFW4k4
z!ye4%D!}6zZrsGG5#$ub%<O3A&)bwDs}>n8B`4{w=iFo^q7&+3VjG|$A>X8)Y#6WX
ZWvZwxEY=+7AkM_Z7GvYr{-=?_8US1@&nN%@


From 219b7eb6a2282b0e919ee064b6ff0d5a443b9655 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Wed, 10 Oct 2007 07:04:59 +0000
Subject: [PATCH 12/29] =?UTF-8?q?=EB=B9=84=EB=B0=80=EA=B8=80=EC=9D=BC=20?=
 =?UTF-8?q?=EA=B2=BD=EC=9A=B0=20=EB=B9=84=EB=B0=80=EB=B2=88=ED=98=B8?=
 =?UTF-8?q?=EB=A5=BC=20=EB=B0=9B=EB=8A=94=20form=EC=9D=84=20=EC=A0=81?=
 =?UTF-8?q?=EC=9A=A9?=
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@2722 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/blog/skins/xe_blog/css/common.css           |  2 +-
 modules/blog/skins/xe_blog/input_password_form.html |  4 ++--
 modules/blog/skins/xe_blog/view_document.html       | 13 ++++++++++++-
 modules/board/skins/xe_gallery/css/common.css       |  2 +-
 .../board/skins/xe_gallery/input_password_form.html |  5 ++---
 modules/board/skins/xe_gallery/view_document.html   | 12 +++++++++++-
 modules/board/skins/xe_list/css/common.css          |  2 +-
 .../board/skins/xe_list/input_password_form.html    |  5 ++---
 modules/board/skins/xe_list/view_document.html      | 12 +++++++++++-
 modules/board/skins/xe_webzine/css/common.css       |  2 +-
 .../board/skins/xe_webzine/input_password_form.html |  4 ++--
 modules/board/skins/xe_webzine/view_document.html   | 12 +++++++++++-
 12 files changed, 57 insertions(+), 18 deletions(-)

diff --git a/modules/blog/skins/xe_blog/css/common.css b/modules/blog/skins/xe_blog/css/common.css
index 5af0f2eec..1aa455ff1 100644
--- a/modules/blog/skins/xe_blog/css/common.css
+++ b/modules/blog/skins/xe_blog/css/common.css
@@ -276,7 +276,7 @@ ul.replyZone .replyIndent { background:url(../images/common/iconReplyArrow.gif)
 .blogWrite .extra_vars .info { clear:both; padding:.5em 0 0 .6em; margin-left:14em; font-size:.9em; color:#999999; background:url(../images/common/iconArrowD8.gif) no-repeat left center;}
 .blogWrite .extra_vars ul li { float:left; margin-right:1em; }
 
-.smallBox { border:1px solid #e0e1db; margin:5em auto 1em auto;}
+.smallBox { border:1px solid #e0e1db; margin-left:auto; margin-right:auto; }
 .smallBox.w268 { width:268px;}
 .smallBox .header { position:relative; _width:100%; background:#ffffff url(../images/normal/bgH3.gif) no-repeat left bottom; overflow:hidden;}
 .smallBox .header h3 { clear:both; font-size:1.2em; padding:.8em 2em .6em 1.2em; border-bottom:3px solid #fe3614; }
diff --git a/modules/blog/skins/xe_blog/input_password_form.html b/modules/blog/skins/xe_blog/input_password_form.html
index fc155f854..7655414d3 100644
--- a/modules/blog/skins/xe_blog/input_password_form.html
+++ b/modules/blog/skins/xe_blog/input_password_form.html
@@ -1,5 +1,5 @@
 <!--%import("filter/input_password.xml")-->
-<!--#include("header.html")-->
+<!--@if(!$form_include)--><!--#include("header.html")--><!--@end-->
 
 <div class="smallBox w268">
 
@@ -27,4 +27,4 @@
 </div>
 
 
-<!--#include("footer.html")-->
+<!--@if(!$form_include)--><!--#include("footer.html")--><!--@end-->
diff --git a/modules/blog/skins/xe_blog/view_document.html b/modules/blog/skins/xe_blog/view_document.html
index 559032510..fed9bc6d1 100644
--- a/modules/blog/skins/xe_blog/view_document.html
+++ b/modules/blog/skins/xe_blog/view_document.html
@@ -35,7 +35,18 @@
         </div>
         <!--@end-->
 
-        <div class="readBody"><div class="contentBody">{$oDocument->getContent()}</div></div>
+        <div class="readBody">
+            <div class="contentBody">
+                <!--@if($oDocument->isSecret() && !$oDocument->isGranted())-->
+                    {@ $form_include = true; }
+                    <!--#include("./input_password_form.html")-->
+
+                <!--@else-->
+                    {$oDocument->getContent()}
+                <!--@end-->
+            </div>
+        </div>
+
 
         <div class="readFooter">
             {@ $tag_list = $oDocument->get('tag_list') }
diff --git a/modules/board/skins/xe_gallery/css/common.css b/modules/board/skins/xe_gallery/css/common.css
index d391c537d..f40e47c3a 100644
--- a/modules/board/skins/xe_gallery/css/common.css
+++ b/modules/board/skins/xe_gallery/css/common.css
@@ -248,7 +248,7 @@ Jeong, Chan Myeong 070601~070630
 .boardWrite .extra_vars .info { clear:both; padding:.5em 0 0 .6em; margin-left:14em; font-size:.9em; color:#999999; background:url(../images/common/iconArrowD8.gif) no-repeat left center;}
 .boardWrite .extra_vars ul li { float:left; margin-right:1em; }
 
-.smallBox { border:1px solid #e0e1db; margin:5em auto 1em auto;}
+.smallBox { border:1px solid #e0e1db; margin-left:auto; margin-right:auto; }
 .smallBox.w268 { width:268px;}
 .smallBox .header { position:relative; _width:100%; background:#ffffff url(../images/normal/bgH3.gif) no-repeat left bottom; overflow:hidden;}
 .smallBox .header h3 { clear:both; font-size:1.2em; padding:.8em 2em .6em 1.2em; border-bottom:3px solid #fe3614; }
diff --git a/modules/board/skins/xe_gallery/input_password_form.html b/modules/board/skins/xe_gallery/input_password_form.html
index 985f1ffd5..136aa8b86 100644
--- a/modules/board/skins/xe_gallery/input_password_form.html
+++ b/modules/board/skins/xe_gallery/input_password_form.html
@@ -1,5 +1,5 @@
 <!--%import("filter/input_password.xml")-->
-<!--#include("header.html")-->
+<!--@if(!$form_include)--><!--#include("header.html")--><!--@end-->
 
 <div class="smallBox w268">
 
@@ -23,5 +23,4 @@
 
 </div>
 
-
-<!--#include("footer.html")-->
+<!--@if(!$form_include)--><!--#include("footer.html")--><!--@end-->
diff --git a/modules/board/skins/xe_gallery/view_document.html b/modules/board/skins/xe_gallery/view_document.html
index 950536cc2..cb45971c8 100644
--- a/modules/board/skins/xe_gallery/view_document.html
+++ b/modules/board/skins/xe_gallery/view_document.html
@@ -79,7 +79,17 @@
         </table>
         <!--@end-->
 
-        <div class="readBody"><div class="contentBody">{$oDocument->getContent()}</div></div>
+        <div class="readBody">
+            <div class="contentBody">
+                <!--@if($oDocument->isSecret() && !$oDocument->isGranted())-->
+                    {@ $form_include = true; }
+                    <!--#include("./input_password_form.html")-->
+
+                <!--@else-->
+                    {$oDocument->getContent()}
+                <!--@end-->
+            </div>
+        </div>
 
         <div class="readFooter">
             {@ $tag_list = $oDocument->get('tag_list') }
diff --git a/modules/board/skins/xe_list/css/common.css b/modules/board/skins/xe_list/css/common.css
index 2b2068fb6..11a61de6c 100644
--- a/modules/board/skins/xe_list/css/common.css
+++ b/modules/board/skins/xe_list/css/common.css
@@ -248,7 +248,7 @@ Jeong, Chan Myeong 070601~070630
 .boardWrite .extra_vars .info { clear:both; padding:.5em 0 0 .6em; margin-left:14em; font-size:.9em; color:#999999; background:url(../images/common/iconArrowD8.gif) no-repeat left center;}
 .boardWrite .extra_vars ul li { float:left; margin-right:1em; }
 
-.smallBox { border:1px solid #e0e1db; margin:5em auto 1em auto;}
+.smallBox { border:1px solid #e0e1db; margin-left:auto; margin-right:auto; }
 .smallBox.w268 { width:268px;}
 .smallBox .header { position:relative; _width:100%; background:#ffffff url(../images/normal/bgH3.gif) no-repeat left bottom; overflow:hidden;}
 .smallBox .header h3 { clear:both; font-size:1.2em; padding:.8em 2em .6em 1.2em; border-bottom:3px solid #fe3614; }
diff --git a/modules/board/skins/xe_list/input_password_form.html b/modules/board/skins/xe_list/input_password_form.html
index 985f1ffd5..136aa8b86 100644
--- a/modules/board/skins/xe_list/input_password_form.html
+++ b/modules/board/skins/xe_list/input_password_form.html
@@ -1,5 +1,5 @@
 <!--%import("filter/input_password.xml")-->
-<!--#include("header.html")-->
+<!--@if(!$form_include)--><!--#include("header.html")--><!--@end-->
 
 <div class="smallBox w268">
 
@@ -23,5 +23,4 @@
 
 </div>
 
-
-<!--#include("footer.html")-->
+<!--@if(!$form_include)--><!--#include("footer.html")--><!--@end-->
diff --git a/modules/board/skins/xe_list/view_document.html b/modules/board/skins/xe_list/view_document.html
index 950536cc2..cb45971c8 100644
--- a/modules/board/skins/xe_list/view_document.html
+++ b/modules/board/skins/xe_list/view_document.html
@@ -79,7 +79,17 @@
         </table>
         <!--@end-->
 
-        <div class="readBody"><div class="contentBody">{$oDocument->getContent()}</div></div>
+        <div class="readBody">
+            <div class="contentBody">
+                <!--@if($oDocument->isSecret() && !$oDocument->isGranted())-->
+                    {@ $form_include = true; }
+                    <!--#include("./input_password_form.html")-->
+
+                <!--@else-->
+                    {$oDocument->getContent()}
+                <!--@end-->
+            </div>
+        </div>
 
         <div class="readFooter">
             {@ $tag_list = $oDocument->get('tag_list') }
diff --git a/modules/board/skins/xe_webzine/css/common.css b/modules/board/skins/xe_webzine/css/common.css
index e5488c79b..1fde44c6f 100644
--- a/modules/board/skins/xe_webzine/css/common.css
+++ b/modules/board/skins/xe_webzine/css/common.css
@@ -255,7 +255,7 @@ Jeong, Chan Myeong 070601~070630
 .boardWrite .extra_vars .info { clear:both; padding:.5em 0 0 .6em; margin-left:14em; font-size:.9em; color:#999999; background:url(../images/common/iconArrowD8.gif) no-repeat left center;}
 .boardWrite .extra_vars ul li { float:left; margin-right:1em; }
 
-.smallBox { border:1px solid #e0e1db; margin:5em auto 1em auto;}
+.smallBox { border:1px solid #e0e1db; margin-left:auto; margin-right:auto; }
 .smallBox.w268 { width:268px;}
 .smallBox .header { position:relative; _width:100%; background:#ffffff url(../images/normal/bgH3.gif) no-repeat left bottom; overflow:hidden;}
 .smallBox .header h3 { clear:both; font-size:1.2em; padding:.8em 2em .6em 1.2em; border-bottom:3px solid #fe3614; }
diff --git a/modules/board/skins/xe_webzine/input_password_form.html b/modules/board/skins/xe_webzine/input_password_form.html
index 985f1ffd5..dcaa6d92b 100644
--- a/modules/board/skins/xe_webzine/input_password_form.html
+++ b/modules/board/skins/xe_webzine/input_password_form.html
@@ -1,5 +1,5 @@
 <!--%import("filter/input_password.xml")-->
-<!--#include("header.html")-->
+<!--@if(!$form_include)--><!--#include("header.html")--><!--@end-->
 
 <div class="smallBox w268">
 
@@ -24,4 +24,4 @@
 </div>
 
 
-<!--#include("footer.html")-->
+<!--@if(!$form_include)--><!--#include("footer.html")--><!--@end-->
diff --git a/modules/board/skins/xe_webzine/view_document.html b/modules/board/skins/xe_webzine/view_document.html
index 950536cc2..cb45971c8 100644
--- a/modules/board/skins/xe_webzine/view_document.html
+++ b/modules/board/skins/xe_webzine/view_document.html
@@ -79,7 +79,17 @@
         </table>
         <!--@end-->
 
-        <div class="readBody"><div class="contentBody">{$oDocument->getContent()}</div></div>
+        <div class="readBody">
+            <div class="contentBody">
+                <!--@if($oDocument->isSecret() && !$oDocument->isGranted())-->
+                    {@ $form_include = true; }
+                    <!--#include("./input_password_form.html")-->
+
+                <!--@else-->
+                    {$oDocument->getContent()}
+                <!--@end-->
+            </div>
+        </div>
 
         <div class="readFooter">
             {@ $tag_list = $oDocument->get('tag_list') }

From b5c539a2d8f0c064646c63ddf569fbf44c09b907 Mon Sep 17 00:00:00 2001
From: k10206 <k10206@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Wed, 10 Oct 2007 07:05:21 +0000
Subject: [PATCH 13/29] =?UTF-8?q?=ED=8F=AC=EC=9D=B8=ED=8A=B8=20=EB=AA=A8?=
 =?UTF-8?q?=EB=93=88=20=EA=B4=80=EB=A6=AC=EC=9E=90=EC=9D=98=20=ED=9A=8C?=
 =?UTF-8?q?=EC=9B=90=20=ED=8F=AC=EC=9D=B8=ED=8A=B8=20=EB=AA=A9=EB=A1=9D?=
 =?UTF-8?q?=EC=97=90=EC=84=9C=20Total=20Count,=20Page=20=ED=91=9C=EC=8B=9C?=
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@2723 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/point/tpl/header.html | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/modules/point/tpl/header.html b/modules/point/tpl/header.html
index 175410b7b..54358016e 100644
--- a/modules/point/tpl/header.html
+++ b/modules/point/tpl/header.html
@@ -3,6 +3,13 @@
 
 <!--@if($module=='admin')-->
 <div class="header4">
+    <!-- ���� -->
+    <!--@if($total_count)-->
+    <div class="summary">
+        <strong>Total</strong> <em>{number_format($total_count)}</em>, Page <em>{number_format($page)}/{number_format($total_page)}</em>
+    </div>
+    <!--@end-->
+
     <ul class="localNavigation">
         <li <!--@if($act=='dispPointAdminConfig')-->class="on"<!--@end-->><a href="{getUrl('act','dispPointAdminConfig')}">{$lang->cmd_point_config}</a></li>
         <li <!--@if($act=='dispPointAdminModuleConfig')-->class="on"<!--@end-->><a href="{getUrl('act','dispPointAdminModuleConfig')}">{$lang->cmd_point_module_config}</a></li>

From 788f3af8c2236bcb83fa0b906e9d33512f6bcb5c Mon Sep 17 00:00:00 2001
From: haneul <syhan@cs.washington.edu>
Date: Wed, 10 Oct 2007 07:23:13 +0000
Subject: [PATCH 14/29] =?UTF-8?q?=EC=8A=A4=ED=8E=98=EC=9D=B8=EC=96=B4=20?=
 =?UTF-8?q?=ED=83=80=EC=9D=B4=ED=8B=80=EC=9D=B4=20en=EC=9C=BC=EB=A1=9C=20?=
 =?UTF-8?q?=EB=90=98=EC=96=B4=EC=9E=88=EC=96=B4=EC=84=9C=20=EC=98=81?=
 =?UTF-8?q?=EB=AC=B8=20=ED=83=80=EC=9D=B4=ED=8B=80=EC=9D=B4=20=EB=82=98?=
 =?UTF-8?q?=EC=98=A4=EC=A7=80=20=EC=95=8A=EB=8D=98=20=EA=B2=83=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
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@2724 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 widgets/counter_status/conf/info.xml | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/widgets/counter_status/conf/info.xml b/widgets/counter_status/conf/info.xml
index 02c13795f..bb75a6d9a 100644
--- a/widgets/counter_status/conf/info.xml
+++ b/widgets/counter_status/conf/info.xml
@@ -2,14 +2,14 @@
 <widget version="0.1">
     <title xml:lang="ko">기본 카운터 위젯</title>
     <title xml:lang="jp">接続カウンター</title>
-    <title xml:lang="en">Basic Counter Widget</title>
-	<title xml:lang="en">Widget de Contador Básico</title>
+    <title xml:lang="en">Basic Counter Widget</title> 
+    <title xml:lang="es">Widget de Contador Básico</title>
     <title xml:lang="zh-CN">计数器</title>
     <author email_address="zero@zeroboard.com" link="http://www.zeroboard.com" date="2007. 2. 28">
         <name xml:lang="ko">제로</name>
         <name xml:lang="jp">Zero</name>
-        <name xml:lang="en">zero</name>
-		<name xml:lang="es">zero</name>
+        <name xml:lang="en">zero</name> 
+	<name xml:lang="es">zero</name>
         <name xml:lang="zh-CN">zero</name>
         <description xml:lang="ko">
             기본 카운터 모듈을 이용하여 전체, 어제, 오늘의 접속현황을 표시합니다.
@@ -22,8 +22,8 @@
             This widget displays the number of people who have visited yesterday and today by using the basic counter module.
             It will also display the total count.
             To get this, the counter module should be installed and the counter add-on should be turned on.
-        </description>
-		<description xml:lang="es">
+        </description> 
+	<description xml:lang="es">
             Este widget de contador básico muestra los números de las personas visitadas en el día de ayer, hoy, y el total.
             Debe instalar el módulo del contador y debe activar el addon del contador.
         </description>

From d80524158c3b96b6e7c7f428d470cb9a875d00d0 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Wed, 10 Oct 2007 07:24:56 +0000
Subject: [PATCH 15/29] =?UTF-8?q?#203=20Optimizer=EC=97=90=EC=84=9C=20css?=
 =?UTF-8?q?=EC=9D=98=20gz=20compress=EC=8B=9C=EC=97=90=20=ED=8A=B9?=
 =?UTF-8?q?=EC=A0=95=20=EC=84=9C=EB=B2=84=EC=97=90=EC=84=9C=20IE6=EB=A1=9C?=
 =?UTF-8?q?=20=EB=B3=BC=EB=95=8C=20=EB=A0=88=EC=9D=B4=EC=95=84=EC=9B=83?=
 =?UTF-8?q?=EC=9D=B4=20=EB=9E=9C=EB=8D=A4=ED=95=98=EA=B2=8C=20=EA=B9=A8?=
 =?UTF-8?q?=EC=96=B4=EC=A7=80=EB=8A=94=20=ED=98=84=EC=83=81=EC=9D=B4=20?=
 =?UTF-8?q?=EB=B0=9C=EA=B2=AC=EB=90=A8.=20=EC=9D=BC=EB=8B=A8=20Optimizer?=
 =?UTF-8?q?=EC=97=90=EC=84=9C=20css=EB=8A=94=20gz=20compress=EB=A5=BC=20?=
 =?UTF-8?q?=ED=95=98=EC=A7=80=20=EC=95=8A=EB=8F=84=EB=A1=9D=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD?=
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@2725 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 classes/optimizer/Optimizer.class.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/classes/optimizer/Optimizer.class.php b/classes/optimizer/Optimizer.class.php
index 519035517..81973fd4f 100644
--- a/classes/optimizer/Optimizer.class.php
+++ b/classes/optimizer/Optimizer.class.php
@@ -98,7 +98,7 @@
 
                 $content_buff .= $str."\r\n";
             }
-            if(Context::isGzEnabled()) $content_buff = ob_gzhandler($content_buff, 5);
+            if($type!="css" && Context::isGzEnabled()) $content_buff = ob_gzhandler($content_buff, 5);
 
             $content_file = eregi_replace("\.php$","",$filename);
             $content_filename = str_replace($this->cache_path, '', $content_file);
@@ -112,7 +112,7 @@
             $modified_time = gmdate("D, d M Y H:i:s");
 
             // gzip 압축 체크
-            if(Context::isGzEnabled()) $gzip_header =  'header("Content-Encoding: gzip");';
+            if($type!="css" && Context::isGzEnabled()) $gzip_header =  'header("Content-Encoding: gzip");';
 
             // 확장자별 content-type 체크
             if($type == 'css') $content_type = 'text/css';

From cd8dfe8956051dd3dd47bb1cbac6d4f4c379edd1 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Wed, 10 Oct 2007 07:44:34 +0000
Subject: [PATCH 16/29] =?UTF-8?q?#216=20=EC=A0=9C=EB=A1=9C=EB=B3=B4?=
 =?UTF-8?q?=EB=93=9CXE=20=EA=B8=B0=EB=B3=B8=20=EC=8A=A4=ED=82=A8=EC=9D=98?=
 =?UTF-8?q?=20=EB=8C=93=EA=B8=80=20=EB=B6=80=EB=B6=84=EC=97=90=20p=20?=
 =?UTF-8?q?=ED=83=9C=EA=B7=B8=EA=B0=80=20display:inline=EC=9C=BC=EB=A1=9C?=
 =?UTF-8?q?=20=EC=B2=98=EB=A6=AC=EB=90=98=EB=8A=94=20=EA=B2=83=EC=9D=84=20?=
 =?UTF-8?q?=EB=8C=93=EA=B8=80=EC=9D=98=20=EB=82=B4=EC=9A=A9=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20block=EC=9C=BC=EB=A1=9C=20=EB=90=98=EA=B2=8C=20?=
 =?UTF-8?q?=ED=95=98=EC=97=AC=20=EC=A4=84=20=EB=B0=94=EA=BF=88=EC=9D=B4=20?=
 =?UTF-8?q?=EC=A0=9C=EB=8C=80=EB=A1=9C=20=EB=90=98=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD.=20=EB=8D=94=EB=B8=94=EC=96=B4=20=EB=8C=93?=
 =?UTF-8?q?=EA=B8=80=EC=97=90=EC=84=9C=20ul/ol=20=ED=83=9C=EA=B7=B8?=
 =?UTF-8?q?=EA=B0=80=20=EC=A0=9C=EB=8C=80=EB=A1=9C=20=EB=82=98=EC=98=A4?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20css=20=EB=B3=80=EA=B2=BD?=
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@2726 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/blog/skins/xe_blog/css/common.css     | 2 ++
 modules/board/skins/xe_gallery/css/common.css | 4 +++-
 modules/board/skins/xe_list/comment.html      | 2 +-
 modules/board/skins/xe_list/css/common.css    | 4 +++-
 modules/board/skins/xe_webzine/css/common.css | 4 +++-
 modules/comment/comment.model.php             | 1 +
 6 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/modules/blog/skins/xe_blog/css/common.css b/modules/blog/skins/xe_blog/css/common.css
index 1aa455ff1..c15647f5a 100644
--- a/modules/blog/skins/xe_blog/css/common.css
+++ b/modules/blog/skins/xe_blog/css/common.css
@@ -211,6 +211,7 @@ ul.replyZone .replyOption { float:right; white-space:nowrap; margin-left:.2em;}
 ul.replyZone .replyOption img { vertical-align:middle;}
 
 ul.replyZone .replyContent { clear:left; }
+ul.replyZone .replyContent p { display:block; }
 ul.replyZone .reply { background-color:#FAFAFA;}
 ul.replyZone .replyIndent { background:url(../images/common/iconReplyArrow.gif) no-repeat .0em .3em; padding-left:1.3em;}
 
@@ -226,6 +227,7 @@ ul.replyZone .replyIndent { background:url(../images/common/iconReplyArrow.gif)
 #reply .replyOption img { vertical-align:middle;}
 
 #reply .replyContent { clear:left; }
+#reply .replyContent p { display:block; }
 #reply .reply { background-color:#FAFAFA;}
 #reply .replyIndent { background:url(../images/common/iconReplyArrow.gif) no-repeat .0em .3em; padding-left:1.3em;}
 
diff --git a/modules/board/skins/xe_gallery/css/common.css b/modules/board/skins/xe_gallery/css/common.css
index f40e47c3a..78eedb5cb 100644
--- a/modules/board/skins/xe_gallery/css/common.css
+++ b/modules/board/skins/xe_gallery/css/common.css
@@ -189,7 +189,7 @@ Jeong, Chan Myeong 070601~070630
 #trackbacks address .date { font:.8em Tahoma; color:#cccccc; float:right;}
 
 #reply { padding:.6em .6em; color:#666666; border:1px solid #e0e1db; margin-top:.5em;}
-#reply li { padding:.6em .8em .6em .6em; line-height:1.25em; clear:both; border-bottom:1px dotted #EEEEEE; list-style:none;}
+#reply li { padding:.6em .8em .6em .6em; line-height:1.25em; clear:both; border-bottom:1px dotted #EEEEEE; }
 #reply p { display:inline; margin-bottom:1em;}
 #reply .author { float:left; padding:0 .3em 0 0; font-size:.9em; color:#3074a5; margin:0 .3em .5em 0;}
 #reply .author a { color:#3074a5; margin-right:.3em; text-decoration:none; }
@@ -199,6 +199,8 @@ Jeong, Chan Myeong 070601~070630
 #reply .replyOption img { vertical-align:middle;}
 
 #reply .replyContent { clear:left; }
+#reply .replyContent p { display:block; }
+#reply .replyContent li { padding:0; border:none; line-height:1.25em; }
 #reply .reply { background-color:#FAFAFA;}
 #reply .replyIndent { background:url(../images/common/iconReplyArrow.gif) no-repeat .0em .3em; padding-left:1.3em;}
 
diff --git a/modules/board/skins/xe_list/comment.html b/modules/board/skins/xe_list/comment.html
index cd417315e..90d27cd3c 100644
--- a/modules/board/skins/xe_list/comment.html
+++ b/modules/board/skins/xe_list/comment.html
@@ -38,7 +38,7 @@
             </div>
 
             <div class="replyContent">
-            {$val->content}
+                {$val->content}
             </div>
 
             <!--@if($val->uploaded_count && $val->uploaded_list)-->
diff --git a/modules/board/skins/xe_list/css/common.css b/modules/board/skins/xe_list/css/common.css
index 11a61de6c..cd593eec0 100644
--- a/modules/board/skins/xe_list/css/common.css
+++ b/modules/board/skins/xe_list/css/common.css
@@ -189,7 +189,7 @@ Jeong, Chan Myeong 070601~070630
 #trackbacks address .date { font:.8em Tahoma; color:#cccccc; float:right;}
 
 #reply { padding:.6em .6em; color:#666666; border:1px solid #e0e1db; margin-top:.5em;}
-#reply li { padding:.6em .8em .6em .6em; line-height:1.25em; clear:both; border-bottom:1px dotted #EEEEEE; list-style:none;}
+#reply li { padding:.6em .8em .6em .6em; line-height:1.25em; clear:both; border-bottom:1px dotted #EEEEEE; }
 #reply p { display:inline; margin-bottom:1em;}
 #reply .author { float:left; padding:0 .3em 0 0; font-size:.9em; color:#3074a5; margin:0 .3em .5em 0;}
 #reply .author a { color:#3074a5; margin-right:.3em; text-decoration:none; }
@@ -199,6 +199,8 @@ Jeong, Chan Myeong 070601~070630
 #reply .replyOption img { vertical-align:middle;}
 
 #reply .replyContent { clear:left; }
+#reply .replyContent p { display:block; }
+#reply .replyContent li { padding:0; border:none; line-height:1.25em; }
 #reply .reply { background-color:#FAFAFA;}
 #reply .replyIndent { background:url(../images/common/iconReplyArrow.gif) no-repeat .0em .3em; padding-left:1.3em;}
 
diff --git a/modules/board/skins/xe_webzine/css/common.css b/modules/board/skins/xe_webzine/css/common.css
index 1fde44c6f..f03307043 100644
--- a/modules/board/skins/xe_webzine/css/common.css
+++ b/modules/board/skins/xe_webzine/css/common.css
@@ -196,7 +196,7 @@ Jeong, Chan Myeong 070601~070630
 #trackbacks address .date { font:.8em Tahoma; color:#cccccc; float:right;}
 
 #reply { padding:.6em .6em; color:#666666; border:1px solid #e0e1db; margin-top:.5em;}
-#reply li { padding:.6em .8em .6em .6em; line-height:1.25em; clear:both; border-bottom:1px dotted #EEEEEE; list-style:none;}
+#reply li { padding:.6em .8em .6em .6em; line-height:1.25em; clear:both; border-bottom:1px dotted #EEEEEE; }
 #reply p { display:inline; margin-bottom:1em;}
 #reply .author { float:left; padding:0 .3em 0 0; font-size:.9em; color:#3074a5; margin:0 .3em .5em 0;}
 #reply .author a { color:#3074a5; margin-right:.3em; text-decoration:none; }
@@ -206,6 +206,8 @@ Jeong, Chan Myeong 070601~070630
 #reply .replyOption img { vertical-align:middle;}
 
 #reply .replyContent { clear:left; }
+#reply .replyContent p { display:block; }
+#reply .replyContent li { padding:0; border:none; line-height:1.25em; }
 #reply .reply { background-color:#FAFAFA;}
 #reply .replyIndent { background:url(../images/common/iconReplyArrow.gif) no-repeat .0em .3em; padding-left:1.3em;}
 
diff --git a/modules/comment/comment.model.php b/modules/comment/comment.model.php
index 04fca7956..b8da4d706 100644
--- a/modules/comment/comment.model.php
+++ b/modules/comment/comment.model.php
@@ -125,6 +125,7 @@
                 $comment_srl = $source_list[$i]->comment_srl;
                 $parent_srl = $source_list[$i]->parent_srl;
                 $member_srl = $source_list[$i]->member_srl;
+                $source_list[$i]->content = preg_replace('!<(ol|ul|blockquote)>!is','<\\1 style="margin-left:40px;">',$source_list[$i]->content);
                 if(!$comment_srl) continue;
 
                 if($is_admin || $this->isGranted($comment_srl) || $member_srl == $logged_info->member_srl) $source_list[$i]->is_granted = true;

From 5f0cb7d0aa4376c333627f231ef88f4053cceff1 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Wed, 10 Oct 2007 08:31:07 +0000
Subject: [PATCH 17/29] =?UTF-8?q?IE6=EC=97=90=EC=84=9C=20=EC=97=90?=
 =?UTF-8?q?=EB=94=94=ED=84=B0=20iframe=20=EC=99=B8=EA=B3=BD=EC=84=A0?=
 =?UTF-8?q?=EC=9D=B4=20=EC=A0=9C=EB=8C=80=EB=A1=9C=20=EB=82=98=EC=98=A4?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
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@2727 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/editor/skins/default/css/editor.css | 2 +-
 modules/editor/tpl/js/editor.js             | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/editor/skins/default/css/editor.css b/modules/editor/skins/default/css/editor.css
index e5360be36..b2c5a13b9 100644
--- a/modules/editor/skins/default/css/editor.css
+++ b/modules/editor/skins/default/css/editor.css
@@ -21,7 +21,7 @@
 
 .xeEditor .editorInfo { background:#fbfbfb; padding:.5em; border:1px solid #e1e1dd; color:#999999; position:relative; margin:5px 20px 0 20px;}
 .xeEditor .close { cursor:pointer; position:absolute; top:3px; right:3px; _top:3px; _right:25px;}
-.xeEditor .editor_iframe_box { background:#ffffff; clear:both; border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:.5em; margin:0 20px 0 20px; }
+.xeEditor .editor_iframe_box { background:#ffffff; clear:both; border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:10px; margin:0 20px 0 20px; }
 .xeEditor .editor_iframe_textarea { background:#ffffff; clear:both; border:1px solid; border-color:#a6a6a6 #d8d8d8 #d8d8d8 #a6a6a6; padding:.5em; margin:0 20px 0 20px; width:100%; font-size:1em; display:none;}
 
 .xeEditor .textAreaDragIndicator { text-align:center; background:url(../images/lineTextAreaDrag.gif) repeat-x left center; padding:5px 0 5px 0; }
diff --git a/modules/editor/tpl/js/editor.js b/modules/editor/tpl/js/editor.js
index 50e6ecd10..5b3a3f676 100755
--- a/modules/editor/tpl/js/editor.js
+++ b/modules/editor/tpl/js/editor.js
@@ -110,7 +110,7 @@ function editorStart(editor_sequence, primary_key, content_key, resizable, edito
     // iframe obj를 찾음
     var iframe_obj = editorGetIFrame(editor_sequence);
     if(!iframe_obj) return;
-    iframe_obj.style.width = '100%'; ///<< iframe_obj의 가로 크기를 100%로 고정
+    xWidth(iframe_obj, xWidth(iframe_obj.parentNode)-20);
 
     // 현 에디터를 감싸고 있는 form문을 찾아서 content object를 찾아서 내용 sync
     var fo_obj = editorGetForm(editor_sequence);

From bc02f578ed86cce62d9350bb7c712904de31dad4 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Wed, 10 Oct 2007 08:37:29 +0000
Subject: [PATCH 18/29] =?UTF-8?q?#214=20=ED=83=88=ED=87=B4=ED=95=9C=20?=
 =?UTF-8?q?=ED=9A=8C=EC=9B=90=EC=9D=BC=20=EA=B2=BD=EC=9A=B0=20=EC=95=84?=
 =?UTF-8?q?=EC=98=88=20=ED=8C=9D=EC=97=85=EB=A9=94=EB=89=B4=EA=B0=80=20?=
 =?UTF-8?q?=EC=95=88=20=EB=82=98=EC=98=A4=EB=8F=84=EB=A1=9D=20=ED=95=98?=
 =?UTF-8?q?=EC=98=80=EC=8A=B5=EB=8B=88=EB=8B=A4.=20=EB=8B=A4=EB=A7=8C=20?=
 =?UTF-8?q?=ED=83=88=ED=87=B4=ED=95=98=EC=98=80=EB=8B=A4=EB=8A=94=20?=
 =?UTF-8?q?=EB=A9=94=EC=84=B8=EC=A7=80=EB=A5=BC=20=EB=B3=B4=EC=97=AC?=
 =?UTF-8?q?=EC=A4=84=20=EB=B0=A9=EB=B2=95=EC=9D=B4=20=EC=97=86=EC=96=B4?=
 =?UTF-8?q?=EC=84=9C=20=EC=9D=BC=EB=8B=A8=20=EA=B8=B0=EB=8A=A5=EC=83=81=20?=
 =?UTF-8?q?=EC=98=A4=EB=A5=98=EB=A7=8C=20=EC=97=86=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=ED=95=98=EA=B2=A0=EC=8A=B5=EB=8B=88=EB=8B=A4.?=
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@2728 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 addons/member_extra_info/member_extra_info.addon.php | 1 +
 modules/member/member.model.php                      | 1 +
 2 files changed, 2 insertions(+)

diff --git a/addons/member_extra_info/member_extra_info.addon.php b/addons/member_extra_info/member_extra_info.addon.php
index af4777ed9..cb027c488 100644
--- a/addons/member_extra_info/member_extra_info.addon.php
+++ b/addons/member_extra_info/member_extra_info.addon.php
@@ -89,6 +89,7 @@
 
             // 대상 회원의 정보를 가져옴
             $target_member_info = $this->getMemberInfoByMemberSrl($member_srl); 
+            if(!$target_member_info->member_srl) return;
             
             // 4. 쪽지 발송 메뉴를 만듬
             if( $target_member_info->allow_message =='Y' || ($target_member_info->allow_message == 'F' && $this->isFriend($member_srl))) {
diff --git a/modules/member/member.model.php b/modules/member/member.model.php
index 0d21b9ce3..0751815bf 100644
--- a/modules/member/member.model.php
+++ b/modules/member/member.model.php
@@ -43,6 +43,7 @@
                 $member_info = $this->getMemberInfoByMemberSrl($member_srl);
             }
             $member_srl = $member_info->member_srl;
+            if(!$member_srl) return;
 
             // 변수 정리
             $user_id = $member_info->user_id;

From 0c69e3e2e384ca3d5c38140d03cefc48e0647f80 Mon Sep 17 00:00:00 2001
From: k10206 <k10206@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Wed, 10 Oct 2007 16:34:56 +0000
Subject: [PATCH 19/29] =?UTF-8?q?=EB=B3=B4=EB=93=9C=EB=AA=A8=EB=93=88?=
 =?UTF-8?q?=EC=9D=98=20(=EA=B8=B0=EB=B3=B8)=20=EB=A9=94=EC=8B=9C=EC=A7=80?=
 =?UTF-8?q?=EA=B0=80=20is=5Fdefault=20=EA=B0=92=EC=9D=B4=20Y=EC=9D=BC=20?=
 =?UTF-8?q?=EB=95=8C=20=EC=B6=9C=EB=A0=A5=EB=90=98=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EC=A0=95=EC=A0=95?=
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@2729 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/board/tpl/header.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/board/tpl/header.html b/modules/board/tpl/header.html
index 3f8938c6d..00c289916 100644
--- a/modules/board/tpl/header.html
+++ b/modules/board/tpl/header.html
@@ -5,7 +5,7 @@
 <!--@if($module_info)-->
 <div class="header4">
     <!--@if($module_info->mid)-->
-    <h4>{$module_info->mid} <!--@if($module_info->is_default=='N')--><span class="bracket">({$lang->is_default})</span><!--@end--> <span class="vr">|</span> <a href="{getUrl('','mid',$module_info->mid)}" onclick="window.open(this.href); return false;" class="view">View</a></h4>
+    <h4>{$module_info->mid} <!--@if($module_info->is_default=='Y')--><span class="bracket">({$lang->is_default})</span><!--@end--> <span class="vr">|</span> <a href="{getUrl('','mid',$module_info->mid)}" onclick="window.open(this.href); return false;" class="view">View</a></h4>
     <!--@end-->
 
     <ul class="localNavigation">

From 94359156c8f3a93e6ab705a561c3f1802ad5f4e6 Mon Sep 17 00:00:00 2001
From: guny <guny@201d5d3c-b55e-5fd7-737f-ddc643e51545>
Date: Thu, 11 Oct 2007 01:04:59 +0000
Subject: [PATCH 20/29] =?UTF-8?q?=EC=A4=91=EA=B5=AD=EC=96=B4=20-=20?=
 =?UTF-8?q?=EC=B6=94=EA=B0=80=EB=B6=84=20=EB=B2=88=EC=97=AD.?=
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@2730 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 addons/google_analytics/conf/info.xml   |  7 +++++++
 modules/board/skins/xe_gallery/skin.xml |  2 ++
 modules/board/skins/xe_list/skin.xml    | 12 +++++++-----
 modules/board/skins/xe_webzine/skin.xml |  2 ++
 modules/install/lang/zh-CN.lang.php     |  4 ++--
 widgets/newest_document/conf/info.xml   |  2 ++
 6 files changed, 22 insertions(+), 7 deletions(-)

diff --git a/addons/google_analytics/conf/info.xml b/addons/google_analytics/conf/info.xml
index d268b3bc3..633b4e426 100644
--- a/addons/google_analytics/conf/info.xml
+++ b/addons/google_analytics/conf/info.xml
@@ -1,16 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <addon version="0.1">
     <title xml:lang="ko">Google Analytics</title>
+    <title xml:lang="zh-CN">Google Analytics</title>
     <author email_address="zero@zeroboard.com" link="http://www.zeroboard.com" date="2007. 9. 19">
         <name xml:lang="ko">제로</name>
+        <name xml:lang="zh-CN">Zero</name>
         <description xml:lang="ko">
             Google Analytics 코드를 사이트에 추가할 수 있습니다.
         </description>
+        <description xml:lang="zh-CN">
+            可以添加Google Analytics代码。
+        </description>
     </author>
     <extra_vars>
         <var name="uacct">
             <title xml:lang="ko">uacct</title>
+            <title xml:lang="zh-CN">uacct</title>
             <description xml:lang="ko">Google Analytics 코드의 _uacct 값을 입력해주세요.</description>
+            <description xml:lang="ko">请输入Google Analytics代码的_uacct值。</description>
         </var>
     </extra_vars>
 </addon>
diff --git a/modules/board/skins/xe_gallery/skin.xml b/modules/board/skins/xe_gallery/skin.xml
index 3c783c441..c08e76846 100644
--- a/modules/board/skins/xe_gallery/skin.xml
+++ b/modules/board/skins/xe_gallery/skin.xml
@@ -108,8 +108,10 @@
     </var>
     <var name="duration_new" type="text">
 	<title xml:lang="ko">new표시 시간 (hours)</title>
+	<title xml:lang="zh-CN">new图标显示时间(hours)</title>
 	<title xml:lang="en">Duration of indication for new item</title>
 	<description xml:lang="ko">새로 등록된 게시물의 new 표시시간을 정할 수 있습니다. </description>
+	<description xml:lang="zh-CN">可以设置最新更新主题的new图标显示时间。</description>
 	<description xml:lang="en">You may set the duration of indication for fresh item. </description>
 	<default>24</default>
     </var>
diff --git a/modules/board/skins/xe_list/skin.xml b/modules/board/skins/xe_list/skin.xml
index fab4d4c62..67f656958 100644
--- a/modules/board/skins/xe_list/skin.xml
+++ b/modules/board/skins/xe_list/skin.xml
@@ -183,11 +183,13 @@
       <description />
     </var>
     <var name="duration_new" type="text">
-      <title xml:lang="ko">new표시 시간 (hours)</title>
-      <title xml:lang="en">Duration of indication for new item</title>
-      <description xml:lang="ko">새로 등록된 게시물의 new 표시시간을 정할 수 있습니다. </description>
-      <description xml:lang="en">You may set the duration of indication for fresh item. </description>
-      <default>24</default>
+	<title xml:lang="ko">new표시 시간 (hours)</title>
+	<title xml:lang="zh-CN">new图标显示时间(hours)</title>
+	<title xml:lang="en">Duration of indication for new item</title>
+	<description xml:lang="ko">새로 등록된 게시물의 new 표시시간을 정할 수 있습니다. </description>
+	<description xml:lang="zh-CN">可以设置最新更新主题的new图标显示时间。</description>
+	<description xml:lang="en">You may set the duration of indication for fresh item. </description>
+	<default>24</default>
     </var>
   </extra_vars>
 </skin>
diff --git a/modules/board/skins/xe_webzine/skin.xml b/modules/board/skins/xe_webzine/skin.xml
index 17d248057..74f4e228a 100644
--- a/modules/board/skins/xe_webzine/skin.xml
+++ b/modules/board/skins/xe_webzine/skin.xml
@@ -118,8 +118,10 @@
     </var>
     <var name="duration_new" type="text">
 	<title xml:lang="ko">new표시 시간 (hours)</title>
+	<title xml:lang="zh-CN">new图标显示时间(hours)</title>
 	<title xml:lang="en">Duration of indication for new item</title>
 	<description xml:lang="ko">새로 등록된 게시물의 new 표시시간을 정할 수 있습니다. </description>
+	<description xml:lang="zh-CN">可以设置最新更新主题的new图标显示时间。</description>
 	<description xml:lang="en">You may set the duration of indication for fresh item. </description>
 	<default>24</default>
     </var>
diff --git a/modules/install/lang/zh-CN.lang.php b/modules/install/lang/zh-CN.lang.php
index 200393501..84f237192 100644
--- a/modules/install/lang/zh-CN.lang.php
+++ b/modules/install/lang/zh-CN.lang.php
@@ -247,8 +247,8 @@ EndOfLicense;
     $lang->admin_title = '管理员信息';
 
     $lang->env_title = '环境设置';
-    $lang->use_optimizer = 'Optimizer 사용';
-    $lang->about_optimizer = 'Optimizer를 사용하면 다수의 CSS/ JS파일을 통합/압축 전송하여 매우 빠르게 사이트 접속이 가능하게 합니다.<br />다만 CSS나 JS에 따라서 문제가 생길 수 있습니다. 이때는 Optimizer 비활성화 하시면 정상적인 동작은 가능합니다';
+    $lang->use_optimizer = '使用Optimizer';
+    $lang->about_optimizer = '使用Optimizer可以对大部分的CSS/ JS文件进行整合/压缩传送使之加快网站访问速度。<br />只是有时会发生小小的问题。这时候请暂时不要使用Optimizer。';
     $lang->use_rewrite = '使用rewrite模块';
     $lang->about_rewrite = '如服务器支持rewrite模块且选择此项，可以简化复杂的网址。<br />例如，http://域名/?document_srl=123简化为http://域名/123。';
     $lang->time_zone = '时区';
diff --git a/widgets/newest_document/conf/info.xml b/widgets/newest_document/conf/info.xml
index 0afd83701..dc9d3ed14 100644
--- a/widgets/newest_document/conf/info.xml
+++ b/widgets/newest_document/conf/info.xml
@@ -104,9 +104,11 @@
         </var>
         <var id="duration_new">
             <name xml:lang="ko">new 표시 시간 (hours)</name>
+            <name xml:lang="zh-CN">new图标显示时间(hours)</name>
             <name xml:lang="en">Duration of indication for new item</name>
             <type>text</type>
             <description xml:lang="ko">새로 등록된 게시물의 new 표시시간을 정할 수 있습니다. (시간 단위)</description>
+	        <description xml:lang="zh-CN">可以设置最新更新主题的new图标显示时间。</description>
             <description xml:lang="en">You may set the duration of indication for fresh item. (unit is hour)</description>
         </var>
         <var id="mid_list">

From 3b5a5a2c112582c3a34685c0932bfb174b6d9d4a Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Thu, 11 Oct 2007 01:20:16 +0000
Subject: [PATCH 21/29] =?UTF-8?q?#180=201=EA=B0=9C=20=EC=9D=B4=EC=83=81?=
 =?UTF-8?q?=EC=9D=84=20=EC=84=A4=EB=AC=B8=EC=9D=91=EB=8B=B5=EC=9C=BC?=
 =?UTF-8?q?=EB=A1=9C=20=EC=84=A0=ED=83=9D=ED=95=9C=20=EA=B2=BD=EC=9A=B0=20?=
 =?UTF-8?q?=ED=95=B4=EB=8B=B9=20=EC=88=98=EB=B3=B4=EB=8B=A4=20=EC=9E=91?=
 =?UTF-8?q?=EB=8D=94=EB=9D=BC=EB=8F=84=20=EC=84=A4=EB=AC=B8=EC=9D=B4=20?=
 =?UTF-8?q?=EB=90=98=EB=8F=84=EB=A1=9D=20=EC=88=98=EC=A0=95?=
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@2731 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/poll/skins/default/js/poll.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/poll/skins/default/js/poll.js b/modules/poll/skins/default/js/poll.js
index e497eee65..0e4d35904 100644
--- a/modules/poll/skins/default/js/poll.js
+++ b/modules/poll/skins/default/js/poll.js
@@ -27,7 +27,7 @@ function doPoll(fo_obj) {
     for(var poll_srl_index in checkcount) {
         var count = checkcount[poll_srl_index];
         var items = item[poll_srl_index];
-        if(count > items.length) {
+        if(items.length < 1 || count < items.length) {
             alert(poll_alert_lang);
             return false;
         }

From ece48de14ea7b8543feb52f69eaf8847ea08abd7 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Thu, 11 Oct 2007 01:21:41 +0000
Subject: [PATCH 22/29] =?UTF-8?q?=EC=84=A4=EB=AC=B8=EC=A1=B0=EC=82=AC?=
 =?UTF-8?q?=EC=9D=98=20=EB=A1=9C=EA=B7=B8=EB=A5=BC=20=EA=B2=80=EC=82=AC?=
 =?UTF-8?q?=ED=95=A0=EB=95=8C=20ipaddress=EC=99=80=20=ED=9A=8C=EC=9B=90?=
 =?UTF-8?q?=EB=B2=88=ED=98=B8=EB=A5=BC=20and=EB=A1=9C=20=EC=97=B0=EC=82=B0?=
 =?UTF-8?q?=ED=95=98=EB=8D=98=20=EC=98=A4=EB=A5=98=EB=A5=BC=20or=EB=A1=9C?=
 =?UTF-8?q?=20=EB=B3=80=EA=B2=BD=ED=95=98=EC=97=AC=20=EC=A4=91=EB=B3=B5=20?=
 =?UTF-8?q?=EC=A1=B0=EC=82=AC=EA=B0=80=20=EC=A0=9C=EB=8C=80=EB=A1=9C=20?=
 =?UTF-8?q?=EC=9D=B4=EB=A3=A8=EC=96=B4=EC=A7=80=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD?=
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@2732 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/poll/queries/getPollLog.xml | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/modules/poll/queries/getPollLog.xml b/modules/poll/queries/getPollLog.xml
index 3cdd945b0..5e1344278 100644
--- a/modules/poll/queries/getPollLog.xml
+++ b/modules/poll/queries/getPollLog.xml
@@ -7,7 +7,9 @@
     </columns>
     <conditions>
         <condition operation="equal" column="poll_srl" var="poll_srl" />
-        <condition operation="equal" column="member_srl" default="0" var="member_srl" pipe="and" />
-        <condition operation="equal" column="ipaddress" var="ipaddress" default="ipaddress()" pipe="and" />
+        <group pipe="and">
+            <condition operation="equal" column="member_srl" default="0" var="member_srl" />
+            <condition operation="equal" column="ipaddress" var="ipaddress" default="ipaddress()" pipe="or" />
+        </group>
     </conditions>
 </query>

From e4d55fc4d137aa84275799b6e3665da187d49275 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Thu, 11 Oct 2007 01:33:03 +0000
Subject: [PATCH 23/29] =?UTF-8?q?#174=20=EC=84=A4=EB=AC=B8=EC=A1=B0?=
 =?UTF-8?q?=EC=82=AC=20=EA=B2=B0=EA=B3=BC=20=EB=B3=B4=EA=B8=B0=20=EA=B8=B0?=
 =?UTF-8?q?=EB=8A=A5=20=EC=B6=94=EA=B0=80?=
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@2733 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/poll/conf/module.xml          |  1 +
 modules/poll/lang/en.lang.php         |  1 +
 modules/poll/lang/es.lang.php         |  1 +
 modules/poll/lang/jp.lang.php         |  1 +
 modules/poll/lang/ko.lang.php         |  1 +
 modules/poll/lang/zh-CN.lang.php      |  1 +
 modules/poll/poll.controller.php      | 13 ++++++++
 modules/poll/poll.model.php           | 45 +++++++++++++++++++++++++++
 modules/poll/skins/default/form.html  |  7 ++++-
 modules/poll/skins/default/js/poll.js | 11 ++++++-
 10 files changed, 80 insertions(+), 2 deletions(-)

diff --git a/modules/poll/conf/module.xml b/modules/poll/conf/module.xml
index 38ffc0de3..683c8f603 100644
--- a/modules/poll/conf/module.xml
+++ b/modules/poll/conf/module.xml
@@ -11,6 +11,7 @@
 
         <action name="procInsert" type="controller" standalone="true" />
         <action name="procPoll" type="controller" standalone="true" />
+        <action name="procPollViewResult" type="controller" standalone="true" />
         <action name="procPollAdminDeleteChecked" type="controller" standalone="true" />
         <action name="procPollAdminInsertConfig" type="controller" standalone="true" />
     </actions>
diff --git a/modules/poll/lang/en.lang.php b/modules/poll/lang/en.lang.php
index 4ed199b3c..3e4d13a26 100644
--- a/modules/poll/lang/en.lang.php
+++ b/modules/poll/lang/en.lang.php
@@ -13,6 +13,7 @@
     $lang->cmd_poll_list = 'View poll list';
     $lang->cmd_delete_checked_poll = 'Delete selected poll'; 
     $lang->cmd_apply_poll = 'Apply poll';
+    $lang->cmd_view_result = 'Preview result';
     $lang->cmd_delete_checked_poll = 'Delete selected poll';  
 
     $lang->success_poll = 'Thank you for joining the poll.';
diff --git a/modules/poll/lang/es.lang.php b/modules/poll/lang/es.lang.php
index 92a082ef6..e640e76ff 100644
--- a/modules/poll/lang/es.lang.php
+++ b/modules/poll/lang/es.lang.php
@@ -13,6 +13,7 @@
     $lang->cmd_poll_list = 'Ver la lista de la encuesta';
     $lang->cmd_delete_checked_poll = 'Eliminar la encuesta seleccionada'; 
     $lang->cmd_apply_poll = 'Aplicar la encuesta';
+    $lang->cmd_view_result = 'Preview result';
     $lang->cmd_delete_checked_poll = 'Eliminar la encuesta seleccionada';  
 
     $lang->success_poll = 'Gracias por participar en la encuesta.';
diff --git a/modules/poll/lang/jp.lang.php b/modules/poll/lang/jp.lang.php
index a4c4aa0d9..cf5798b21 100644
--- a/modules/poll/lang/jp.lang.php
+++ b/modules/poll/lang/jp.lang.php
@@ -13,6 +13,7 @@
     $lang->cmd_poll_list = 'アンケートのリスト表示';
     $lang->cmd_delete_checked_poll = '選択項目削除';
     $lang->cmd_apply_poll = 'アンケート調査へ参加する';
+    $lang->cmd_view_result = 'Preview result';
     $lang->cmd_delete_checked_poll = '選択アンケート削除';
 
     $lang->success_poll = 'アンケート調査へのご応募ありがとうございます。';
diff --git a/modules/poll/lang/ko.lang.php b/modules/poll/lang/ko.lang.php
index f39c3f6c4..fd579635c 100644
--- a/modules/poll/lang/ko.lang.php
+++ b/modules/poll/lang/ko.lang.php
@@ -13,6 +13,7 @@
     $lang->cmd_poll_list = '설문조사 목록 보기';
     $lang->cmd_delete_checked_poll = '선택항목 삭제';
     $lang->cmd_apply_poll = '설문 참여';
+    $lang->cmd_view_result = '결과 보기';
     $lang->cmd_delete_checked_poll = '선택 설문 삭제';
 
     $lang->success_poll = '설문에 응하여 주셔서 감사합니다';
diff --git a/modules/poll/lang/zh-CN.lang.php b/modules/poll/lang/zh-CN.lang.php
index eb99a2826..ae2bc1319 100644
--- a/modules/poll/lang/zh-CN.lang.php
+++ b/modules/poll/lang/zh-CN.lang.php
@@ -13,6 +13,7 @@
     $lang->cmd_poll_list = '查看目录';
     $lang->cmd_delete_checked_poll = '删除所选项目';
     $lang->cmd_apply_poll = '参与投票';
+    $lang->cmd_view_result = 'Preview result';
     $lang->cmd_delete_checked_poll = '删除所选';
 
     $lang->success_poll = '感谢您参与投票。';
diff --git a/modules/poll/poll.controller.php b/modules/poll/poll.controller.php
index 0ae6f62a6..204d0d539 100644
--- a/modules/poll/poll.controller.php
+++ b/modules/poll/poll.controller.php
@@ -190,5 +190,18 @@
             $this->add('tpl',$tpl);
             $this->setMessage('success_poll');
         }
+
+        /**
+         * @brief 결과 미리 보기
+         **/
+        function procPollViewResult() {
+            $poll_srl = Context::get('poll_srl'); 
+
+            $oPollModel = &getModel('poll');
+            $tpl = $oPollModel->getPollResultHtml($poll_srl);
+
+            $this->add('poll_srl', $poll_srl);
+            $this->add('tpl',$tpl);
+        }
     }
 ?>
diff --git a/modules/poll/poll.model.php b/modules/poll/poll.model.php
index 582f9f465..0f137e9ab 100644
--- a/modules/poll/poll.model.php
+++ b/modules/poll/poll.model.php
@@ -84,6 +84,51 @@
             return $oTemplate->compile($tpl_path, $tpl_file);
         }
 
+        /**
+         * @brief 결과 html을 return
+         **/
+        function getPollResultHtml($poll_srl) {
+            $args->poll_srl = $poll_srl;
+
+            // 해당 설문조사에 대한 내용을 조사
+            $output = executeQuery('poll.getPoll', $args);
+            if(!$output->data) return '';
+
+            $poll->style = $style;
+            $poll->poll_count = (int)$output->data->poll_count;
+            $poll->stop_date = $output->data->stop_date;
+
+            $output = executeQuery('poll.getPollTitle', $args);
+            if(!$output->data) return;
+            if(!is_array($output->data)) $output->data = array($output->data);
+            foreach($output->data as $key => $val) {
+                $poll->poll[$val->poll_index_srl]->title = $val->title;
+                $poll->poll[$val->poll_index_srl]->checkcount = $val->checkcount;
+                $poll->poll[$val->poll_index_srl]->poll_count = $val->poll_count;
+            }
+
+            $output = executeQuery('poll.getPollItem', $args);
+            foreach($output->data as $key => $val) {
+                $poll->poll[$val->poll_index_srl]->item[] = $val;
+            }
+
+            $poll->poll_srl = $poll_srl;
+
+            $tpl_file = "result";
+
+            Context::set('poll',$poll);
+
+            // 기본 설정의 스킨, 컬러셋 설정 
+            $oModuleModel = &getModel('module');
+            $poll_config = $oModuleModel->getModuleConfig('poll');
+            if(!$poll_config->skin) $poll_config->skin = 'default';
+            Context::set('poll_config', $poll_config);
+            $tpl_path = sprintf("%sskins/%s/", $this->module_path, $poll_config->skin);
+
+            $oTemplate = &TemplateHandler::getInstance();
+            return $oTemplate->compile($tpl_path, $tpl_file);
+        }
+
         /**
          * @brief 선택된 설문조사 - 스킨의 컬러셋을 return
          **/
diff --git a/modules/poll/skins/default/form.html b/modules/poll/skins/default/form.html
index 4cdc7e7bf..afdd700ce 100644
--- a/modules/poll/skins/default/form.html
+++ b/modules/poll/skins/default/form.html
@@ -64,7 +64,12 @@
         <td class="r"><img src="./images/blank.gif" height="7" alt="blank" /></td>
     </tr>
     <tr>
-        <td colspan="3" class="poll_button"><div><span class="button"><input type="submit" value="{$lang->cmd_apply_poll}" class="poll_button" /></span></div></td>
+        <td colspan="3" class="poll_button">
+            <div>
+                <span class="button"><input type="button" value="{$lang->cmd_view_result}" class="poll_button" onclick="doPollViewResult('{$poll->poll_srl}'); return false;"/></span>
+                <span class="button"><input type="submit" value="{$lang->cmd_apply_poll}" class="poll_button" /></span>
+            </div>
+        </td>
     </tr>
     <tr>
         <td class="lb" ><img src="./images/lb.png" alt="lb" class="iePngFix" width="7" height="7" /></td>
diff --git a/modules/poll/skins/default/js/poll.js b/modules/poll/skins/default/js/poll.js
index 0e4d35904..5bfc05e45 100644
--- a/modules/poll/skins/default/js/poll.js
+++ b/modules/poll/skins/default/js/poll.js
@@ -42,10 +42,19 @@ function doPoll(fo_obj) {
 
 /* 설문 조사후 내용을 바꿀 함수 */
 function completePoll(ret_obj) {
-    alert(ret_obj['message']);
     var poll_srl = ret_obj['poll_srl'];
     var tpl = ret_obj['tpl'];
     var width = xWidth("poll_"+poll_srl);
     xInnerHtml("poll_"+poll_srl, tpl);
     xWidth("poll_"+poll_srl, width);
 }
+
+/* 설문 미리 보기 */
+function doPollViewResult(poll_srl) {
+    var params = new Array();
+    params['poll_srl'] = poll_srl;
+
+    var response_tags = new Array('error','message','poll_srl', 'tpl');
+
+    exec_xml('poll','procPollViewResult', params, completePoll, response_tags);
+}

From 5bdad63b7f4263b2fce73c6184d2521453de9922 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Thu, 11 Oct 2007 03:37:37 +0000
Subject: [PATCH 24/29] =?UTF-8?q?#217=20=EC=8D=B8=EB=84=A4=EC=9D=BC=20?=
 =?UTF-8?q?=EC=83=9D=EC=84=B1=20=EB=B0=A9=EB=B2=95=EC=9D=84=20=EB=AC=B8?=
 =?UTF-8?q?=EC=84=9C=20=EB=AA=A8=EB=93=88=EC=97=90=EC=84=9C=20crop/ratio?=
 =?UTF-8?q?=EB=A5=BC=20=EC=A0=95=ED=95=A0=20=EC=88=98=20=EC=9E=88=EA=B2=8C?=
 =?UTF-8?q?=20=ED=95=98=EA=B3=A0=20xe=5Fwebzine,=20xe=5Fgallery=EC=97=90?=
 =?UTF-8?q?=EC=84=9C=20=EB=B0=A9=EC=8B=9D/=EA=B0=80=EB=A1=9C/=EC=84=B8?=
 =?UTF-8?q?=EB=A1=9C=ED=81=AC=EA=B8=B0=EB=A5=BC=20=EC=A7=80=EC=A0=95?=
 =?UTF-8?q?=ED=95=A0=20=EC=88=98=20=EC=9E=88=EA=B2=8C=20=ED=95=A8.=20newes?=
 =?UTF-8?q?t=5Fimages=20=EC=9C=84=EC=A0=AF=20=EC=97=AD=EC=8B=9C=20?=
 =?UTF-8?q?=EB=8F=99=EC=9D=BC=ED=95=9C=20=EC=84=A4=EC=A0=95=EA=B3=BC=20?=
 =?UTF-8?q?=EB=8F=99=EC=9E=91=EC=9D=84=20=EC=B6=94=EA=B0=80=ED=95=A8?=
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@2734 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 classes/file/FileHandler.class.php            |  12 +-
 modules/board/skins/xe_gallery/header.html    |   5 +
 modules/board/skins/xe_gallery/list.html      |   6 +-
 modules/board/skins/xe_gallery/skin.xml       | 246 ++++++++--------
 modules/board/skins/xe_webzine/css/common.css |   2 +-
 modules/board/skins/xe_webzine/header.html    |   5 +
 modules/board/skins/xe_webzine/list.html      |   6 +-
 modules/board/skins/xe_webzine/skin.xml       | 267 +++++++++---------
 modules/document/conf/module.xml              |   3 +
 .../document/document.admin.controller.php    |  39 +++
 modules/document/document.admin.view.php      |  13 +
 modules/document/document.class.php           |  15 +
 modules/document/document.item.php            |  17 +-
 modules/document/document.model.php           |  15 +
 modules/document/lang/en.lang.php             |   6 +
 modules/document/lang/es.lang.php             |   6 +
 modules/document/lang/jp.lang.php             |   6 +
 modules/document/lang/ko.lang.php             |   6 +
 modules/document/lang/zh-CN.lang.php          |   6 +
 modules/document/tpl/document_config.html     |  24 ++
 modules/document/tpl/document_list.html       |   3 +-
 modules/document/tpl/filter/insert_config.xml |   7 +
 modules/document/tpl/header.html              |  10 +
 modules/document/tpl/js/document_admin.js     |  14 +-
 widgets/newest_images/conf/info.xml           |  30 +-
 widgets/newest_images/newest_images.class.php |   8 +
 widgets/newest_images/skins/default/list.html |   2 +-
 .../newest_images/skins/xe_official/list.html |   2 +-
 28 files changed, 514 insertions(+), 267 deletions(-)
 create mode 100644 modules/document/tpl/document_config.html
 create mode 100644 modules/document/tpl/filter/insert_config.xml
 create mode 100644 modules/document/tpl/header.html

diff --git a/classes/file/FileHandler.class.php b/classes/file/FileHandler.class.php
index 934618562..47e49e2ef 100644
--- a/classes/file/FileHandler.class.php
+++ b/classes/file/FileHandler.class.php
@@ -182,7 +182,7 @@
         /**
          * @brief 특정 이미지 파일을 특정 위치로 옮김 (옮길때 이미지의 크기를 리사이징할 수 있음..)
          **/
-        function createImageFile($source_file, $target_file, $resize_width = 0, $resize_height = 0, $target_type = '') {
+        function createImageFile($source_file, $target_file, $resize_width = 0, $resize_height = 0, $target_type = '', $thumbnail_type = 'crop') {
             if(!file_exists($source_file)) return;
             if(!$resize_width) $resize_width = 100;
             if(!$resize_height) $resize_height = $resize_width;
@@ -227,8 +227,14 @@
             if($resize_height>0 && $height >= $resize_height) $height_per = $resize_height / $height;
             else $height_per = $height / $resize_height;
 
-            if($width_per > $height_per) $per = $height_per;
-            else $per = $width_per;
+            if($thumbnail_type == 'ratio') {
+                if($width_per > $height_per) $per = $height_per;
+                else $per = $width_per;
+            } else {
+                if($width_per < $height_per) $per = $height_per;
+                else $per = $width_per;
+
+            }
 
             if(!$per) $per = 1;
 
diff --git a/modules/board/skins/xe_gallery/header.html b/modules/board/skins/xe_gallery/header.html
index 9b0ed7b9d..17d3a5dca 100644
--- a/modules/board/skins/xe_gallery/header.html
+++ b/modules/board/skins/xe_gallery/header.html
@@ -20,6 +20,11 @@
     {@ $module_info->duration_new = 12 }
 <!--@end-->
 
+<!-- 스킨 설정중 썸네일 관련 항목을 지정 -->
+<!--@if(!$module_info->thumbnail_type)-->{@ $module_info->thumbnail_type = 'crop'; }<!--@end-->
+<!--@if(!$module_info->thumbnail_width)-->{@ $module_info->thumbnail_width = 100; }<!--@end-->
+<!--@if(!$module_info->thumbnail_height)-->{@ $module_info->thumbnail_height = 100; }<!--@end-->
+
 <!-- 상단 텍스트 출력 -->
 {$module_info->header_text}
 
diff --git a/modules/board/skins/xe_gallery/list.html b/modules/board/skins/xe_gallery/list.html
index 6c422b7fc..9edf2d6ec 100644
--- a/modules/board/skins/xe_gallery/list.html
+++ b/modules/board/skins/xe_gallery/list.html
@@ -92,10 +92,10 @@
                 <!--@if(!$document->isNotice())-->
 
                 <div class="cell">
-                    <!--@if($document->thumbnailExists(122))-->
-                        <a href="{getUrl('','document_srl',$document->document_srl)}"><img src="{$document->getThumbnail(122)}" border="0" alt="" class="thumb"/></a>
+                    <!--@if($document->thumbnailExists($module_info->thumbnail_width, $module_info->thumbnail_height, $module_info->thumbnail_type))-->
+                        <a href="{getUrl('','document_srl',$document->document_srl)}"><img src="{$document->getThumbnail($module_info->thumbnail_width, $module_info->thumbnail_height, $module_info->thumbnail_type)}" border="0" alt="" class="thumb"/></a>
                     <!--@else-->
-                        <img src="./images/blank.gif" border="0" alt="" class="thumb" width="122" height="122" />
+                        <img src="./images/blank.gif" border="0" alt="" class="thumb" width="{$module_info->thumbnail_width}" height="{$module_info->thumbnail_height}" />
                     <!--@end-->
 
                     <div class="title">
diff --git a/modules/board/skins/xe_gallery/skin.xml b/modules/board/skins/xe_gallery/skin.xml
index c08e76846..aae0f36af 100644
--- a/modules/board/skins/xe_gallery/skin.xml
+++ b/modules/board/skins/xe_gallery/skin.xml
@@ -1,119 +1,135 @@
 <?xml version="1.0" encoding="utf-8"?>
 <skin>
-  <title xml:lang="ko">제로보드XE 게시판 기본 스킨 (갤러리형)</title>
-  <title xml:lang="jp">ゼロボードXE掲示板のデフォルトスキン（ギャラリースタイル）</title>
-  <title xml:lang="zh-CN">Zeroboard XE board 基本皮肤（相册型）</title>
-  <title xml:lang="en">ZeroboardXE Basic Board Skin (Gallery Style)</title>
-  <maker email_address="zero@zeroboard.com" link="http://www.zeroboard.com" date="2007. 2. 28">
-    <name xml:lang="ko">(주)NHN</name>
-    <name xml:lang="jp">（株）NHN</name>
-    <name xml:lang="zh-CN">(株)NHN</name>
-    <name xml:lang="en">NHN Corp</name>
-    <description xml:lang="ko">
-        제로보드XE 게시판의 갤러리형태의 기본 스킨입니다.
-        디자인 : 서기정 (http://blog.naver.com/addcozy)
-        HTML/CSS : 정찬명 (http://naradesign.net)
-    </description>
-    <description xml:lang="jp">
-        ゼロボードXEのギャラリースタイルのデフォルトスキンです。
-        デザイン：ソギジョン (http://blog.naver.com/addcozy)
-        HTML/CSS：ジョンチャンミョン (http://naradesign.net)
-    </description>
-   <description xml:lang="zh-CN">
-        zeroboard XE Board的相册型基本皮肤。
-        设计 : Ki-Jeong Seo (http://blog.naver.com/addcozy)
-        HTML/CSS : Chan-Myung Jeong (http://naradesign.net)
-    </description>
-    <description xml:lang="en">
-        This is the basic gallery style board skin of Zeroboard XE.
-        Design : Ki-Jeong Seo (http://blog.naver.com/addcozy)
-        HTML/CSS : Chan-Myung Jeong (http://naradesign.net)
-    </description>
-  </maker>
-  <colorset>
-    <color name="white" src="screenshot/white.gif">
-      <title xml:lang="ko">하얀색(기본)</title>
-      <title xml:lang="jp">白（デフォルト）</title>
-      <title xml:lang="zh-CN">白色(基本)</title>
-      <title xml:lang="en">White (default)</title>
-    </color>
-    <color name="cyan" src="screenshot/cyan.gif">
-      <title xml:lang="ko">청록색</title>
-      <title xml:lang="jp">青緑</title>
-      <title xml:lang="zh-CN">青绿色</title>
-      <title xml:lang="en">Cyan</title>
-    </color>
-    <color name="green" src="screenshot/green.gif">
-      <title xml:lang="ko">초록색</title>
-      <title xml:lang="jp">緑</title>
-      <title xml:lang="zh-CN">绿色</title>
-      <title xml:lang="en">Green</title>
-    </color>
-    <color name="red" src="screenshot/red.gif">
-      <title xml:lang="ko">빨간색</title>
-      <title xml:lang="jp">赤</title>
-      <title xml:lang="zh-CN">红色</title>
-      <title xml:lang="en">Red</title>
-    </color>
-    <color name="purple" src="screenshot/purple.gif">
-      <title xml:lang="ko">보라색</title>
-      <title xml:lang="jp">紫</title>
-      <title xml:lang="zh-CN">紫色</title>
-      <title xml:lang="en">Purple</title>
+    <title xml:lang="ko">제로보드XE 게시판 기본 스킨 (갤러리형)</title>
+    <title xml:lang="jp">ゼロボードXE掲示板のデフォルトスキン（ギャラリースタイル）</title>
+    <title xml:lang="zh-CN">Zeroboard XE board 基本皮肤（相册型）</title>
+    <title xml:lang="en">ZeroboardXE Basic Board Skin (Gallery Style)</title>
+    <maker email_address="zero@zeroboard.com" link="http://www.zeroboard.com" date="2007. 2. 28">
+        <name xml:lang="ko">(주)NHN</name>
+        <name xml:lang="jp">（株）NHN</name>
+        <name xml:lang="zh-CN">(株)NHN</name>
+        <name xml:lang="en">NHN Corp</name>
+        <description xml:lang="ko">
+            제로보드XE 게시판의 갤러리형태의 기본 스킨입니다.
+            디자인 : 서기정 (http://blog.naver.com/addcozy)
+            HTML/CSS : 정찬명 (http://naradesign.net)
+        </description>
+        <description xml:lang="jp">
+            ゼロボードXEのギャラリースタイルのデフォルトスキンです。
+            デザイン：ソギジョン (http://blog.naver.com/addcozy)
+            HTML/CSS：ジョンチャンミョン (http://naradesign.net)
+        </description>
+     <description xml:lang="zh-CN">
+            zeroboard XE Board的相册型基本皮肤。
+            设计 : Ki-Jeong Seo (http://blog.naver.com/addcozy)
+            HTML/CSS : Chan-Myung Jeong (http://naradesign.net)
+        </description>
+        <description xml:lang="en">
+            This is the basic gallery style board skin of Zeroboard XE.
+            Design : Ki-Jeong Seo (http://blog.naver.com/addcozy)
+            HTML/CSS : Chan-Myung Jeong (http://naradesign.net)
+        </description>
+    </maker>
+    <colorset>
+        <color name="white" src="screenshot/white.gif">
+            <title xml:lang="ko">하얀색(기본)</title>
+            <title xml:lang="jp">白（デフォルト）</title>
+            <title xml:lang="zh-CN">白色(基本)</title>
+            <title xml:lang="en">White (default)</title>
+        </color>
+        <color name="cyan" src="screenshot/cyan.gif">
+            <title xml:lang="ko">청록색</title>
+            <title xml:lang="jp">青緑</title>
+            <title xml:lang="zh-CN">青绿色</title>
+            <title xml:lang="en">Cyan</title>
+        </color>
+        <color name="green" src="screenshot/green.gif">
+            <title xml:lang="ko">초록색</title>
+            <title xml:lang="jp">緑</title>
+            <title xml:lang="zh-CN">绿色</title>
+            <title xml:lang="en">Green</title>
+        </color>
+        <color name="red" src="screenshot/red.gif">
+            <title xml:lang="ko">빨간색</title>
+            <title xml:lang="jp">赤</title>
+            <title xml:lang="zh-CN">红色</title>
+            <title xml:lang="en">Red</title>
+        </color>
+        <color name="purple" src="screenshot/purple.gif">
+            <title xml:lang="ko">보라색</title>
+            <title xml:lang="jp">紫</title>
+            <title xml:lang="zh-CN">紫色</title>
+            <title xml:lang="en">Purple</title>
 </color>
-  </colorset>
-  <extra_vars>
-    <var name="order_target" type="select">
-        <title xml:lang="ko">정렬 대상</title>
-        <title xml:lang="jp">ソート対象</title>
-        <title xml:lang="zh-CN">排序对象</title>
-        <title xml:lang="en">Align Target</title>
-        <type>select</type>
-        <description xml:lang="ko">등록된 순서 또는 변경된 순서로 정렬을 할 수 있습니다.</description>
-        <description xml:lang="jp">登録された順、変更された順でソートできます。</description>
-        <description xml:lang="zh-CN">可对主题按发表顺或最后更新顺进行排序。</description>
-        <description xml:lang="en">It can align articles as registered order or modified order.</description>
-        <default>newest</default>
-        <default>updated</default>
-    </var>
-    <var name="title" type="text">
-        <title xml:lang="ko">게시판 제목</title>
-        <title xml:lang="jp">掲示板タイトル</title>
-        <title xml:lang="zh-CN">版面标题</title>
-        <title xml:lang="en">Title of Board</title>
-        <description xml:lang="ko">게시판의 제목을 적어주세요.</description>
-        <description xml:lang="jp">掲示板タイトルを入力してください。</description>
-        <description xml:lang="zh-CN">请输入版面标题。(留空为不显示)</description>
-        <description xml:lang="en">Please input the title of board.</description>
-    </var>
-    <var name="sub_title" type="text">
-        <title xml:lang="ko">게시판 부제목</title>
-        <title xml:lang="jp">掲示板サブタイトル</title>
-        <title xml:lang="zh-CN">版面副标题</title>
-        <title xml:lang="en">Subtitle of Board</title>
-        <description lang="ko">게시판 제목 옆에 나타날 부제목을 적어주세요.</description>
-        <description lang="jp">掲示板タイトルの横表示されるサブタイトルを入力してください。</description>
-        <description lang="zh-CN">请输入显示在版面标题旁的副标题。(留空为不显示)</description>
-        <description lang="en">Please input the subtitle of board which will be displayed beside of board title.</description>
-    </var>
-    <var name="comment" type="textarea">
-        <title xml:lang="ko">게시판 상세 설명</title>
-        <title xml:lang="jp">掲示板の説明</title>
-        <title xml:lang="zh-CN">版面详细说明</title>
-        <title xml:lang="en">Description of Board</title>
-        <description lang="ko">게시판 제목 아래 표시될 설명을 입력하실 수 있습니다.</description>
-        <description lang="jp">掲示板タイトルの下に表示される説明文入力してください。</description>
-        <description lang="zh-CN">请输入显示在版面标题下的说明。(留空为不显示)</description>
-        <description lang="en">You may input description which will be displayed under the board title.</description>
-    </var>
-    <var name="duration_new" type="text">
-	<title xml:lang="ko">new표시 시간 (hours)</title>
-	<title xml:lang="zh-CN">new图标显示时间(hours)</title>
-	<title xml:lang="en">Duration of indication for new item</title>
-	<description xml:lang="ko">새로 등록된 게시물의 new 표시시간을 정할 수 있습니다. </description>
-	<description xml:lang="zh-CN">可以设置最新更新主题的new图标显示时间。</description>
-	<description xml:lang="en">You may set the duration of indication for fresh item. </description>
-	<default>24</default>
-    </var>
-  </extra_vars>
+    </colorset>
+    <extra_vars>
+        <var name="order_target" type="select">
+            <title xml:lang="ko">정렬 대상</title>
+            <title xml:lang="jp">ソート対象</title>
+            <title xml:lang="zh-CN">排序对象</title>
+            <title xml:lang="en">Align Target</title>
+            <type>select</type>
+            <description xml:lang="ko">등록된 순서 또는 변경된 순서로 정렬을 할 수 있습니다.</description>
+            <description xml:lang="jp">登録された順、変更された順でソートできます。</description>
+            <description xml:lang="zh-CN">可对主题按发表顺或最后更新顺进行排序。</description>
+            <description xml:lang="en">It can align articles as registered order or modified order.</description>
+            <default>newest</default>
+            <default>updated</default>
+        </var>
+        <var name="title" type="text">
+            <title xml:lang="ko">게시판 제목</title>
+            <title xml:lang="jp">掲示板タイトル</title>
+            <title xml:lang="zh-CN">版面标题</title>
+            <title xml:lang="en">Title of Board</title>
+            <description xml:lang="ko">게시판의 제목을 적어주세요.</description>
+            <description xml:lang="jp">掲示板タイトルを入力してください。</description>
+            <description xml:lang="zh-CN">请输入版面标题。(留空为不显示)</description>
+            <description xml:lang="en">Please input the title of board.</description>
+        </var>
+        <var name="sub_title" type="text">
+            <title xml:lang="ko">게시판 부제목</title>
+            <title xml:lang="jp">掲示板サブタイトル</title>
+            <title xml:lang="zh-CN">版面副标题</title>
+            <title xml:lang="en">Subtitle of Board</title>
+            <description lang="ko">게시판 제목 옆에 나타날 부제목을 적어주세요.</description>
+            <description lang="jp">掲示板タイトルの横表示されるサブタイトルを入力してください。</description>
+            <description lang="zh-CN">请输入显示在版面标题旁的副标题。(留空为不显示)</description>
+            <description lang="en">Please input the subtitle of board which will be displayed beside of board title.</description>
+        </var>
+        <var name="comment" type="textarea">
+            <title xml:lang="ko">게시판 상세 설명</title>
+            <title xml:lang="jp">掲示板の説明</title>
+            <title xml:lang="zh-CN">版面详细说明</title>
+            <title xml:lang="en">Description of Board</title>
+            <description lang="ko">게시판 제목 아래 표시될 설명을 입력하실 수 있습니다.</description>
+            <description lang="jp">掲示板タイトルの下に表示される説明文入力してください。</description>
+            <description lang="zh-CN">请输入显示在版面标题下的说明。(留空为不显示)</description>
+            <description lang="en">You may input description which will be displayed under the board title.</description>
+        </var>
+        <var name="duration_new" type="text">
+            <title xml:lang="ko">new표시 시간 (hours)</title>
+            <title xml:lang="zh-CN">new图标显示时间(hours)</title>
+            <title xml:lang="en">Duration of indication for new item</title>
+            <description xml:lang="ko">새로 등록된 게시물의 new 표시시간을 정할 수 있습니다. </description>
+            <description xml:lang="zh-CN">可以设置最新更新主题的new图标显示时间。</description>
+            <description xml:lang="en">You may set the duration of indication for fresh item. </description>
+            <default>24</default>
+        </var>
+        <var name="thumbnail_type" type="select">
+            <title xml:lang="ko">썸네일 생성 방법</title>
+            <description xml:lang="ko">썸네일 생성 방법을 선택할 수 있습니다. (crop : 꽉 채우기, ratio : 비율 맞추기)</description>
+            <default>crop</default>
+            <default>ratio</default>
+        </var>
+        <var name="thumbnail_width" type="text">
+            <title xml:lang="ko">썸네일 가로크기</title>
+            <description xml:lang="ko">썸네일의 가로 크기를 지정할 수 있습니다. (기본 100px)</description>
+            <default>100</default>
+        </var>
+        <var name="thumbnail_height" type="text">
+            <title xml:lang="ko">썸네일 세로크기</title>
+            <description xml:lang="ko">썸네일의 세로 크기를 지정할 수 있습니다. (기본 100px)</description>
+            <default>100</default>
+        </var>
+    </extra_vars>
 </skin>
diff --git a/modules/board/skins/xe_webzine/css/common.css b/modules/board/skins/xe_webzine/css/common.css
index f03307043..ce6f5e9f0 100644
--- a/modules/board/skins/xe_webzine/css/common.css
+++ b/modules/board/skins/xe_webzine/css/common.css
@@ -86,7 +86,7 @@ Jeong, Chan Myeong 070601~070630
 
 .boardList.thumbnail { margin-top:-1px; border-bottom:none;}
 .boardList.thumbnail td { border-top:none; border-bottom:1px solid #eff0ed; padding:1.5em 0 0 1.5em; overflow:hidden;}
-.boardList.thumbnail div.cell { float:left; width:130px; margin:0 1.5em 0 0; padding-bottom:1.5em;}
+.boardList.thumbnail div.cell { float:left; margin:0 1.5em 0 0; padding-bottom:1.5em;}
 .boardList.thumbnail div.cell img.thumb { padding:2px; border:1px solid #e0e1db; display:block; margin-bottom:1em;}
 .boardList.thumbnail div.title { color:#444444; margin-bottom:.2em; padding-left:3px;}
 .boardList.thumbnail div.title a { color:#444444;}
diff --git a/modules/board/skins/xe_webzine/header.html b/modules/board/skins/xe_webzine/header.html
index c47025a56..268e27c2a 100644
--- a/modules/board/skins/xe_webzine/header.html
+++ b/modules/board/skins/xe_webzine/header.html
@@ -20,6 +20,11 @@
     {@ $module_info->duration_new = 12 }
 <!--@end-->
 
+<!-- 스킨 설정중 썸네일 관련 항목을 지정 -->
+<!--@if(!$module_info->thumbnail_type)-->{@ $module_info->thumbnail_type = 'crop'; }<!--@end-->
+<!--@if(!$module_info->thumbnail_width)-->{@ $module_info->thumbnail_width = 100; }<!--@end-->
+<!--@if(!$module_info->thumbnail_height)-->{@ $module_info->thumbnail_height = 100; }<!--@end-->
+
 <!-- 상단 텍스트 출력 -->
 {$module_info->header_text}
 
diff --git a/modules/board/skins/xe_webzine/list.html b/modules/board/skins/xe_webzine/list.html
index ee7204aa8..7ac609d04 100644
--- a/modules/board/skins/xe_webzine/list.html
+++ b/modules/board/skins/xe_webzine/list.html
@@ -12,7 +12,7 @@
 <!-- 목록 출력 -->
 <table cellspacing="0" summary="" class="boardList">
   <col width="50" />
-  <col width="120" />
+  <col width="{$module_info->thumbnail_width+20}" />
   <col />
   <col width="120" />
   <col width="60" />
@@ -101,8 +101,8 @@
         <tr class="bg{($no+1)%2+1}">
 
             <td rowspan="2" class="num"><!--@if($document_srl == $document->document_srl)--><img src="./images/common/iconArrowD8.gif" alt="" border="0" /><!--@else-->{$no}<!--@end--></td>
-            <!--@if($document->thumbnailExists(100))-->
-            <td rowspan="2" class="thumb"><a href="{getUrl('','document_srl',$document->document_srl)}" class="thumbnailMedium"><img src="{$document->getThumbnail(100)}" border="0" alt="" /></a></td>
+            <!--@if($document->thumbnailExists($module_info->thumbnail_width, $module_info->thumbnail_height, $module_info->thumbnail_type))-->
+            <td rowspan="2" class="thumb"><a href="{getUrl('','document_srl',$document->document_srl)}" class="thumbnailMedium"><img src="{$document->getThumbnail($module_info->thumbnail_width, $module_info->thumbnail_height, $module_info->thumbnail_type)}" border="0" alt="" /></a></td>
             <td class="title">
             <!--@else-->
             <td class="title" colspan="2">
diff --git a/modules/board/skins/xe_webzine/skin.xml b/modules/board/skins/xe_webzine/skin.xml
index 74f4e228a..b93032232 100644
--- a/modules/board/skins/xe_webzine/skin.xml
+++ b/modules/board/skins/xe_webzine/skin.xml
@@ -1,129 +1,144 @@
 <?xml version="1.0" encoding="utf-8"?>
 <skin>
-  <title xml:lang="ko">제로보드XE 게시판 기본 스킨(웹진형)</title>
-  <title xml:lang="jp">ゼロボードXE掲示板のデフォルトスキン（ウェブジンスタイル）</title>
-  <title xml:lang="zh-CN">Zeroboard XE Board 基本皮肤（网络杂志型）</title>
-  <title xml:lang="en">ZeroboardXE Basic Board Skin (Webzine Style)</title>
-  <maker email_address="zero@zeroboard.com" link="http://www.zeroboard.com" date="2007. 2. 28">
-    <name xml:lang="ko">(주)NHN</name>
-    <name xml:lang="jp">（株）NHN</name>
-    <name xml:lang="zh-CN">(株)NHN</name>
-    <name xml:lang="en">NHN Corp</name>
-    <description xml:lang="ko">
-        제로보드XE 게시판의 웹진형태 기본 스킨입니다.
-        디자인 : 서기정 (http://blog.naver.com/addcozy)
-        HTML/CSS : 정찬명 (http://naradesign.net)
-    </description>
-    <description xml:lang="jp">
-        ゼロボードXE掲示板のウェブジンスタイルのデフォルトスキンです。
-        デザイン：ソギジョン (http://blog.naver.com/addcozy)
-        HTML/CSS：ジョンチャンミョン (http://naradesign.net)
-    </description>
-    <description xml:lang="zh-CN">
-        zeroboard XE Board 网络杂志型基本皮肤。
-        设计 : Ki-Jeong Seo (http://blog.naver.com/addcozy)
-        HTML/CSS : Chan-Myung Jeong (http://naradesign.net)
-    </description>
-    <description xml:lang="en">
-        This is the basic webzine style board skin of Zeroboard XE.
-        Design : Ki-Jeong Seo (http://blog.naver.com/addcozy)
-        HTML/CSS : Chan-Myung Jeong (http://naradesign.net)
-    </description>
-  </maker>
-  <colorset>
-    <color name="white" src="screenshot/white.gif">
-      <title xml:lang="ko">하얀색(기본)</title>
-      <title xml:lang="jp">白（デフォルト）</title>
-      <title xml:lang="zh-CN">白色（基本）</title>
-      <title xml:lang="en">White (default)</title>
-    </color>
-    <color name="cyan" src="screenshot/cyan.gif">
-      <title xml:lang="ko">청록색</title>
-      <title xml:lang="jp">青緑</title>
-      <title xml:lang="zh-CN">青绿色</title>
-      <title xml:lang="en">Cyan</title>
-    </color>
-    <color name="green" src="screenshot/green.gif">
-      <title xml:lang="ko">초록색</title>
-      <title xml:lang="jp">緑</title>
-      <title xml:lang="zh-CN">绿色</title>
-      <title xml:lang="en">Green</title>
-    </color>
-    <color name="red" src="screenshot/red.gif">
-      <title xml:lang="ko">빨간색</title>
-      <title xml:lang="jp">赤</title>
-      <title xml:lang="zh-CN">红色</title>
-      <title xml:lang="en">Red</title>
-    </color>
-    <color name="purple" src="screenshot/purple.gif">
-      <title xml:lang="ko">보라색</title>
-      <title xml:lang="jp">紫</title>
-      <title xml:lang="zh-CN">紫色</title>
-      <title xml:lang="en">Purple</title>
-    </color>
-  </colorset>
-  <extra_vars>
-    <var name="order_target" type="select">
-        <title xml:lang="ko">정렬 대상</title>
-        <title xml:lang="jp">ソート対象</title>
-        <title xml:lang="zh-CN">排序对象</title>
-        <title xml:lang="en">Align Target</title>
-        <type>select</type>
-        <description xml:lang="ko">등록된 순서 또는 변경된 순서로 정렬을 할 수 있습니다.</description>
-        <description xml:lang="jp">登録された順、変更された順でソートできます。</description>
-        <description xml:lang="zh-CN">可对主题按发表顺或最后更新顺进行排序。</description>
-        <description xml:lang="en">It can align articles as registered order or modified order.</description>
-        <default>newest</default>
-        <default>updated</default>
-    </var>
-    <var name="title" type="text">
-        <title xml:lang="ko">게시판 제목</title>
-        <title xml:lang="jp">掲示板タイトル</title>
-        <title xml:lang="zh-CN">版面标题</title>
-        <title xml:lang="en">Title of Board</title>
-        <description xml:lang="ko">게시판의 제목을 적어주세요.</description>
-        <description xml:lang="jp">掲示板タイトルを入力してください。</description>
-        <description xml:lang="zh-CN">请输入版面标题。(留空为不显示)</description>
-        <description xml:lang="en">Please input the title of board.</description>
-    </var>
-    <var name="sub_title" type="text">
-        <title xml:lang="ko">게시판 부제목</title>
-        <title xml:lang="jp">掲示板サブタイトル</title>
-        <title xml:lang="zh-CN">版面副标题</title>
-        <title xml:lang="en">Subtitle of Board</title>
-        <description lang="ko">게시판 제목 옆에 나타날 부제목을 적어주세요.</description>
-        <description lang="jp">掲示板タイトルの横表示されるサブタイトルを入力してください。</description>
-        <description lang="zh-CN">请输入显示在版面标题旁的副标题。(留空为不显示)</description>
-        <description lang="en">Please input the subtitle of board which will be displayed beside of board title.</description>
-    </var>
-    <var name="comment" type="textarea">
-        <title xml:lang="ko">게시판 상세 설명</title>
-        <title xml:lang="jp">掲示板の説明</title>
-        <title xml:lang="zh-CN">版面详细说明</title>
-        <title xml:lang="en">Description of Board</title>
-        <description lang="ko">게시판 제목 아래 표시될 설명을 입력하실 수 있습니다.</description>
-        <description lang="jp">掲示板タイトルの下に表示される説明文入力してください。</description>
-        <description lang="zh-CN">请输入显示在版面标题下的说明。(留空为不显示)</description>
-        <description lang="en">You may input description which will be displayed under the board title.</description>
-    </var>
-    <var name="subject_cut_size" type="text">
-      <title xml:lang="ko">제목 글자수</title>
-      <title xml:lang="jp">タイトルの文字数</title>
-      <title xml:lang="zh-CN">标题字数</title>
-      <title xml:lang="en">Length of Subject</title>
-      <description lang="ko">제목 글자수를 지정할 수 있습니다. (0또는 비워주시면 자르지 않습니다)</description>
-      <description lang="jp">タイトルの文字数が指定できます（「0」または空欄の場合は、文字数を制限しません）。</description>
-      <description lang="zh-CN">可以指定标题字数。(0或留空为不限)</description>
-      <description lang="en">You may set length of title. (0 or blank value will not restrict the length)</description>
-    </var>
-    <var name="duration_new" type="text">
-	<title xml:lang="ko">new표시 시간 (hours)</title>
-	<title xml:lang="zh-CN">new图标显示时间(hours)</title>
-	<title xml:lang="en">Duration of indication for new item</title>
-	<description xml:lang="ko">새로 등록된 게시물의 new 표시시간을 정할 수 있습니다. </description>
-	<description xml:lang="zh-CN">可以设置最新更新主题的new图标显示时间。</description>
-	<description xml:lang="en">You may set the duration of indication for fresh item. </description>
-	<default>24</default>
-    </var>
-  </extra_vars>
+    <title xml:lang="ko">제로보드XE 게시판 기본 스킨(웹진형)</title>
+    <title xml:lang="jp">ゼロボードXE掲示板のデフォルトスキン（ウェブジンスタイル）</title>
+    <title xml:lang="zh-CN">Zeroboard XE Board 基本皮肤（网络杂志型）</title>
+    <title xml:lang="en">ZeroboardXE Basic Board Skin (Webzine Style)</title>
+    <maker email_address="zero@zeroboard.com" link="http://www.zeroboard.com" date="2007. 2. 28">
+        <name xml:lang="ko">(주)NHN</name>
+        <name xml:lang="jp">（株）NHN</name>
+        <name xml:lang="zh-CN">(株)NHN</name>
+        <name xml:lang="en">NHN Corp</name>
+        <description xml:lang="ko">
+                제로보드XE 게시판의 웹진형태 기본 스킨입니다.
+                디자인 : 서기정 (http://blog.naver.com/addcozy)
+                HTML/CSS : 정찬명 (http://naradesign.net)
+        </description>
+        <description xml:lang="jp">
+                ゼロボードXE掲示板のウェブジンスタイルのデフォルトスキンです。
+                デザイン：ソギジョン (http://blog.naver.com/addcozy)
+                HTML/CSS：ジョンチャンミョン (http://naradesign.net)
+        </description>
+        <description xml:lang="zh-CN">
+                zeroboard XE Board 网络杂志型基本皮肤。
+                设计 : Ki-Jeong Seo (http://blog.naver.com/addcozy)
+                HTML/CSS : Chan-Myung Jeong (http://naradesign.net)
+        </description>
+        <description xml:lang="en">
+                This is the basic webzine style board skin of Zeroboard XE.
+                Design : Ki-Jeong Seo (http://blog.naver.com/addcozy)
+                HTML/CSS : Chan-Myung Jeong (http://naradesign.net)
+        </description>
+    </maker>
+    <colorset>
+        <color name="white" src="screenshot/white.gif">
+            <title xml:lang="ko">하얀색(기본)</title>
+            <title xml:lang="jp">白（デフォルト）</title>
+            <title xml:lang="zh-CN">白色（基本）</title>
+            <title xml:lang="en">White (default)</title>
+        </color>
+        <color name="cyan" src="screenshot/cyan.gif">
+            <title xml:lang="ko">청록색</title>
+            <title xml:lang="jp">青緑</title>
+            <title xml:lang="zh-CN">青绿色</title>
+            <title xml:lang="en">Cyan</title>
+        </color>
+        <color name="green" src="screenshot/green.gif">
+            <title xml:lang="ko">초록색</title>
+            <title xml:lang="jp">緑</title>
+            <title xml:lang="zh-CN">绿色</title>
+            <title xml:lang="en">Green</title>
+        </color>
+        <color name="red" src="screenshot/red.gif">
+            <title xml:lang="ko">빨간색</title>
+            <title xml:lang="jp">赤</title>
+            <title xml:lang="zh-CN">红色</title>
+            <title xml:lang="en">Red</title>
+        </color>
+        <color name="purple" src="screenshot/purple.gif">
+            <title xml:lang="ko">보라색</title>
+            <title xml:lang="jp">紫</title>
+            <title xml:lang="zh-CN">紫色</title>
+            <title xml:lang="en">Purple</title>
+        </color>
+    </colorset>
+    <extra_vars>
+        <var name="order_target" type="select">
+            <title xml:lang="ko">정렬 대상</title>
+            <title xml:lang="jp">ソート対象</title>
+            <title xml:lang="zh-CN">排序对象</title>
+            <title xml:lang="en">Align Target</title>
+            <description xml:lang="ko">등록된 순서 또는 변경된 순서로 정렬을 할 수 있습니다.</description>
+            <description xml:lang="jp">登録された順、変更された順でソートできます。</description>
+            <description xml:lang="zh-CN">可对主题按发表顺或最后更新顺进行排序。</description>
+            <description xml:lang="en">It can align articles as registered order or modified order.</description>
+            <default>newest</default>
+            <default>updated</default>
+        </var>
+        <var name="title" type="text">
+            <title xml:lang="ko">게시판 제목</title>
+            <title xml:lang="jp">掲示板タイトル</title>
+            <title xml:lang="zh-CN">版面标题</title>
+            <title xml:lang="en">Title of Board</title>
+            <description xml:lang="ko">게시판의 제목을 적어주세요.</description>
+            <description xml:lang="jp">掲示板タイトルを入力してください。</description>
+            <description xml:lang="zh-CN">请输入版面标题。(留空为不显示)</description>
+            <description xml:lang="en">Please input the title of board.</description>
+        </var>
+        <var name="sub_title" type="text">
+            <title xml:lang="ko">게시판 부제목</title>
+            <title xml:lang="jp">掲示板サブタイトル</title>
+            <title xml:lang="zh-CN">版面副标题</title>
+            <title xml:lang="en">Subtitle of Board</title>
+            <description lang="ko">게시판 제목 옆에 나타날 부제목을 적어주세요.</description>
+            <description lang="jp">掲示板タイトルの横表示されるサブタイトルを入力してください。</description>
+            <description lang="zh-CN">请输入显示在版面标题旁的副标题。(留空为不显示)</description>
+            <description lang="en">Please input the subtitle of board which will be displayed beside of board title.</description>
+        </var>
+        <var name="comment" type="textarea">
+            <title xml:lang="ko">게시판 상세 설명</title>
+            <title xml:lang="jp">掲示板の説明</title>
+            <title xml:lang="zh-CN">版面详细说明</title>
+            <title xml:lang="en">Description of Board</title>
+            <description lang="ko">게시판 제목 아래 표시될 설명을 입력하실 수 있습니다.</description>
+            <description lang="jp">掲示板タイトルの下に表示される説明文入力してください。</description>
+            <description lang="zh-CN">请输入显示在版面标题下的说明。(留空为不显示)</description>
+            <description lang="en">You may input description which will be displayed under the board title.</description>
+        </var>
+        <var name="subject_cut_size" type="text">
+            <title xml:lang="ko">제목 글자수</title>
+            <title xml:lang="jp">タイトルの文字数</title>
+            <title xml:lang="zh-CN">标题字数</title>
+            <title xml:lang="en">Length of Subject</title>
+            <description lang="ko">제목 글자수를 지정할 수 있습니다. (0또는 비워주시면 자르지 않습니다)</description>
+            <description lang="jp">タイトルの文字数が指定できます（「0」または空欄の場合は、文字数を制限しません）。</description>
+            <description lang="zh-CN">可以指定标题字数。(0或留空为不限)</description>
+            <description lang="en">You may set length of title. (0 or blank value will not restrict the length)</description>
+        </var>
+        <var name="duration_new" type="text">
+            <title xml:lang="ko">new표시 시간 (hours)</title>
+            <title xml:lang="zh-CN">new图标显示时间(hours)</title>
+            <title xml:lang="en">Duration of indication for new item</title>
+            <description xml:lang="ko">새로 등록된 게시물의 new 표시시간을 정할 수 있습니다. </description>
+            <description xml:lang="zh-CN">可以设置最新更新主题的new图标显示时间。</description>
+            <description xml:lang="en">You may set the duration of indication for fresh item. </description>
+            <default>24</default>
+        </var>
+        <var name="thumbnail_type" type="select">
+            <title xml:lang="ko">썸네일 생성 방법</title>
+            <description xml:lang="ko">썸네일 생성 방법을 선택할 수 있습니다. (crop : 꽉 채우기, ratio : 비율 맞추기)</description>
+            <default>crop</default>
+            <default>ratio</default>
+        </var>
+        <var name="thumbnail_width" type="text">
+            <title xml:lang="ko">썸네일 가로크기</title>
+            <description xml:lang="ko">썸네일의 가로 크기를 지정할 수 있습니다. (기본 100px)</description>
+            <default>100</default>
+        </var>
+        <var name="thumbnail_height" type="text">
+            <title xml:lang="ko">썸네일 세로크기</title>
+            <description xml:lang="ko">썸네일의 세로 크기를 지정할 수 있습니다. (기본 100px)</description>
+            <default>100</default>
+        </var>
+    </extra_vars>
 </skin>
diff --git a/modules/document/conf/module.xml b/modules/document/conf/module.xml
index e86b2095e..32832cd11 100644
--- a/modules/document/conf/module.xml
+++ b/modules/document/conf/module.xml
@@ -6,7 +6,10 @@
         <action name="dispDocumentPreview" type="view" standalone="true" />
 
         <action name="dispDocumentAdminList" type="view" admin_index="true" standalone="true" />
+        <action name="dispDocumentAdminConfig" type="view" standalone="true" />
 
         <action name="procDocumentAdminDeleteChecked" type="controller" standalone="true" />
+        <action name="procDocumentAdminInsertConfig" type="controller" standalone="true" />
+        <action name="procDocumentAdminDeleteAllThumbnail" type="controller" standalone="true" />
     </actions>
 </module>
diff --git a/modules/document/document.admin.controller.php b/modules/document/document.admin.controller.php
index 428285695..b7fd9adae 100644
--- a/modules/document/document.admin.controller.php
+++ b/modules/document/document.admin.controller.php
@@ -253,5 +253,44 @@
 
             return new Object();
         }
+
+        /**
+         * @brief 문서 모듈의 기본설정 저장
+         **/
+        function procDocumentAdminInsertConfig() {
+            // 기본 정보를 받음
+            $args = Context::gets('thumbnail_type');
+
+            // module Controller 객체 생성하여 입력
+            $oModuleController = &getController('module');
+            $output = $oModuleController->insertModuleConfig('document',$args);
+            return $output;
+        }
+
+        /**
+         * @brief 모든 생성된 썸네일 삭제
+         **/
+        function procDocumentAdminDeleteAllThumbnail() {
+
+            // files/attaches/images/ 디렉토리를 순환하면서 thumbnail_*.jpg 파일을 모두 삭제
+            $this->deleteThumbnailFile('./files/attach/images');
+
+            $this->setMessage('success_deleted');
+        }
+
+        function deleteThumbnailFile($path) {
+            $directory = dir($path);
+            while($entry = $directory->read()) {
+                if ($entry != "." && $entry != "..") {
+                    if (is_dir($path."/".$entry)) {
+                        $this->deleteThumbnailFile($path."/".$entry);
+                    } else {
+                        if(!eregi('^thumbnail_([^\.]*)\.jpg$',$entry)) continue;
+                        @unlink($path.'/'.$entry);
+                    }
+                }
+            }
+            $directory->close();
+        }
     }
 ?>
diff --git a/modules/document/document.admin.view.php b/modules/document/document.admin.view.php
index 6879e6831..190168522 100644
--- a/modules/document/document.admin.view.php
+++ b/modules/document/document.admin.view.php
@@ -77,5 +77,18 @@
             $this->setTemplateFile('document_list');
         }
 
+        /**
+         * @brief 문서 모듈 설정 
+         **/
+        function dispDocumentAdminConfig() {
+            $oDocumentModel = &getModel('document');
+            $config = $oDocumentModel->getDocumentConfig();
+            Context::set('config',$config);
+
+            // 템플릿 파일 지정
+            $this->setTemplatePath($this->module_path.'tpl');
+            $this->setTemplateFile('document_config');
+        }
+
     }
 ?>
diff --git a/modules/document/document.class.php b/modules/document/document.class.php
index dca58332e..13aca99ec 100644
--- a/modules/document/document.class.php
+++ b/modules/document/document.class.php
@@ -23,6 +23,7 @@
             $oModuleController = &getController('module');
             $oModuleController->insertActionForward('document', 'view', 'dispDocumentAdminList');
             $oModuleController->insertActionForward('document', 'view', 'dispDocumentPrint');
+            $oModuleController->insertActionForward('document', 'view', 'dispDocumentAdminConfig');
 
             $oDB = &DB::getInstance();
             $oDB->addIndex("documents","idx_module_list_order", array("module_srl","list_order"));
@@ -38,6 +39,7 @@
          **/
         function checkUpdate() {
             $oDB = &DB::getInstance();
+            $oModuleModel = &getModel('module');
 
             /**
              * 2007. 7. 23 : 확장변수(extra_vars1~20까지 추가)
@@ -57,6 +59,11 @@
             if(!$oDB->isIndexExists("documents","idx_module_readed_count")) return true;
             if(!$oDB->isIndexExists("documents","idx_module_voted_count")) return true;
 
+            /**
+             * 2007. 10. 11 : 관리자 페이지의 기본 설정 Action 추가
+             **/
+            if(!$oModuleModel->getActionForward('dispDocumentAdminConfig')) return true;
+
             return false;
         }
 
@@ -65,6 +72,8 @@
          **/
         function moduleUpdate() {
             $oDB = &DB::getInstance();
+            $oModuleModel = &getModel('module');
+            $oModuleController = &getController('module');
 
             /**
              * 2007. 7. 23 : 확장변수(extra_vars1~20까지 추가)
@@ -102,6 +111,12 @@
                 $oDB->addIndex("documents","idx_module_voted_count", array("module_srl","voted_count"));
             }
 
+            /**
+             * 2007. 10. 11 : 관리자 페이지의 기본 설정 Action 추가
+             **/
+            if(!$oModuleModel->getActionForward('dispDocumentAdminConfig')) 
+                $oModuleController->insertActionForward('document', 'view', 'dispDocumentAdminConfig');
+
             return new Object(0,'success_updated');
         }
 
diff --git a/modules/document/document.item.php b/modules/document/document.item.php
index 57cb9b3c1..cdd4e8637 100644
--- a/modules/document/document.item.php
+++ b/modules/document/document.item.php
@@ -288,12 +288,12 @@
             return $oTrackbackModel->getTrackbackList($this->document_srl, $is_admin);
         }
 
-        function thumbnailExists($width = 80, $height = 0) {
-            if(!$this->getThumbnail($width, $height)) return false;
+        function thumbnailExists($width = 80, $height = 0, $type = '') {
+            if(!$this->getThumbnail($width, $height, $type)) return false;
             return true;
         }
 
-        function getThumbnail($width = 80, $height = 0) {
+        function getThumbnail($width = 80, $height = 0, $thumbnail_type = '') {
             if(!$height) $height = $width;
 
             // 문서의 이미지 첨부파일 위치를 구함
@@ -315,6 +315,13 @@
 
             // 썸네일 파일이 있으면 url return
             if(file_exists($thumbnail_file)) return Context::getRequestUri().$thumbnail_file;
+
+            // 문서 모듈의 기본 설정에서 Thumbnail의 생성 방법을 구함
+            if(!in_array($thumbnail_type, array('crop','ratio'))) {
+                $oDocumentModel = &getModel('document');
+                $config = $oDocumentModel->getDocumentConfig();
+                $thumbnail_type = $config->thumbnail_type;
+            }
             
             // 생성 시작
             FileHandler::writeFile($thumbnail_file, '', 'w');
@@ -330,7 +337,7 @@
                     $filename = $file->uploaded_filename;
                     if(!file_exists($filename)) continue;
 
-                    FileHandler::createImageFile($filename, $thumbnail_file, $width, $height, 'jpg');
+                    FileHandler::createImageFile($filename, $thumbnail_file, $width, $height, 'jpg', $thumbnail_type);
                     if(file_exists($thumbnail_file)) return Context::getRequestUri().$thumbnail_file;
                 }
             }
@@ -353,7 +360,7 @@
                 return;
             }
 
-            FileHandler::createImageFile($tmp_file, $thumbnail_file, $width, $height, 'jpg');
+            FileHandler::createImageFile($tmp_file, $thumbnail_file, $width, $height, 'jpg', $config->thumbnail_type);
             @unlink($tmp_file);
 
             return Context::getRequestUri().$thumbnail_file;
diff --git a/modules/document/document.model.php b/modules/document/document.model.php
index 446c6498c..64024906e 100644
--- a/modules/document/document.model.php
+++ b/modules/document/document.model.php
@@ -312,5 +312,20 @@
 
             return $output;
         }
+
+        /**
+         * @brief 문서 설정 정보를 구함
+         **/
+        function getDocumentConfig() {
+            if(!$GLOBLAS['__document_config__'])  {
+                $oModuleModel = &getModel('module');
+                $config = $oModuleModel->getModuleConfig('document');
+
+                if(!$config->thumbnail_type) $config->thumbnail_type = 'crop';
+                $GLOBLAS['__document_config__'] = $config;
+            }
+
+            return $GLOBLAS['__document_config__'];
+        }
     }
 ?>
diff --git a/modules/document/lang/en.lang.php b/modules/document/lang/en.lang.php
index 44ec73200..975aff8a8 100644
--- a/modules/document/lang/en.lang.php
+++ b/modules/document/lang/en.lang.php
@@ -5,6 +5,12 @@
      * @brief  Document module's basic language pack
      **/
 
+    $lang->document_list = 'Document list';
+    $lang->thumbnail_type = 'Thumbnail Type';
+    $lang->thumbnail_crop = 'Crop';
+    $lang->thumbnail_ratio = 'Ratio';
+    $lang->cmd_delete_all_thumbnail = 'Delete all thumbnails';
+
 	$lang->cmd_toggle_checked_document = '선택항목 반전';
     $lang->cmd_delete_checked_document = 'Delete selected';
 
diff --git a/modules/document/lang/es.lang.php b/modules/document/lang/es.lang.php
index 18b674152..3e580611d 100644
--- a/modules/document/lang/es.lang.php
+++ b/modules/document/lang/es.lang.php
@@ -5,6 +5,12 @@
      * @sumario Paquete del idioma español para el módulo de documentos.
      **/
 
+    $lang->document_list = 'Document list';
+    $lang->thumbnail_type = 'Thumbnail Type';
+    $lang->thumbnail_crop = 'Crop';
+    $lang->thumbnail_ratio = 'Ratio';
+    $lang->cmd_delete_all_thumbnail = 'Delete all thumbnails';
+
 	$lang->cmd_toggle_checked_document = '선택항목 반전';
     $lang->cmd_delete_checked_document = 'Eliminar lo seleccionado';
 
diff --git a/modules/document/lang/jp.lang.php b/modules/document/lang/jp.lang.php
index 47aa81db8..1c13db6f6 100644
--- a/modules/document/lang/jp.lang.php
+++ b/modules/document/lang/jp.lang.php
@@ -5,6 +5,12 @@
      * @brief  ドキュメント（document）モジュルの基本言語パッケージ
      **/
 
+    $lang->document_list = 'Document list';
+    $lang->thumbnail_type = 'Thumbnail Type';
+    $lang->thumbnail_crop = 'Crop';
+    $lang->thumbnail_ratio = 'Ratio';
+    $lang->cmd_delete_all_thumbnail = 'Delete all thumbnails';
+
 	$lang->cmd_toggle_checked_document = '선택항목 반전';
     $lang->cmd_delete_checked_document = '選択項目削除';
 
diff --git a/modules/document/lang/ko.lang.php b/modules/document/lang/ko.lang.php
index 2c398727e..4c80823e7 100644
--- a/modules/document/lang/ko.lang.php
+++ b/modules/document/lang/ko.lang.php
@@ -5,6 +5,12 @@
      * @brief  문서(document) 모듈의 기본 언어팩
      **/
 
+    $lang->document_list = '문서 목록';
+    $lang->thumbnail_type = '썸네일 생성 방법';
+    $lang->thumbnail_crop = '잘라내기 (정해진 크기에 꽉 찬 모습의 썸네일을 만듭니다)';
+    $lang->thumbnail_ratio = '비율 맞추기 (원본 이미지의 비율에 맞춥니다. 다만 정해진 크기에 여백이 생깁니다)';
+    $lang->cmd_delete_all_thumbnail = '썸네일 모두 삭제';
+
 	$lang->cmd_toggle_checked_document = '선택항목 반전';
     $lang->cmd_delete_checked_document = '선택항목 삭제';
 
diff --git a/modules/document/lang/zh-CN.lang.php b/modules/document/lang/zh-CN.lang.php
index 486cffac5..98ec06f41 100644
--- a/modules/document/lang/zh-CN.lang.php
+++ b/modules/document/lang/zh-CN.lang.php
@@ -5,6 +5,12 @@
      * @brief  文章(document)模块语言包
      **/
 
+    $lang->document_list = 'Document list';
+    $lang->thumbnail_type = 'Thumbnail Type';
+    $lang->thumbnail_crop = 'Crop';
+    $lang->thumbnail_ratio = 'Ratio';
+    $lang->cmd_delete_all_thumbnail = 'Delete all thumbnails';
+
     $lang->cmd_toggle_checked_document = '反选';
     $lang->cmd_delete_checked_document = '删除所选';
 
diff --git a/modules/document/tpl/document_config.html b/modules/document/tpl/document_config.html
new file mode 100644
index 000000000..8bb859f1f
--- /dev/null
+++ b/modules/document/tpl/document_config.html
@@ -0,0 +1,24 @@
+<!--#include("header.html")-->
+<!--%import("filter/insert_config.xml")-->
+
+<form action="./" method="get" onsubmit="return procFilter(this, insert_config)">
+    <table cellspacing="0" class="tableType2 gap1">
+    <col width="200" />
+    <col />
+    <tr>
+        <th scope="col">{$lang->thumbnail_type}</th>
+        <td>
+            <input type="radio" name="thumbnail_type" value="crop" <!--@if($config->thumbnail_type != 'ratio')-->checked="checked"<!--@end-->/> {$lang->thumbnail_crop} <br />
+            <input type="radio" name="thumbnail_type" value="ratio" <!--@if($config->thumbnail_type == 'ratio')-->checked="checked"<!--@end-->/> {$lang->thumbnail_ratio}
+        </td>
+    </tr>
+    </table>
+
+    <!-- 버튼 -->
+    <div class="fl gap1">
+        <span class="button"><input type="button" value="{$lang->cmd_delete_all_thumbnail}" onclick="doDeleteAllThumbnail(); return false;"/></span>
+    </div>
+    <div class="fr gap1">
+        <span class="button"><input type="submit" value="{$lang->cmd_registration}" accesskey="s" /></span>
+    </div>
+</form>
diff --git a/modules/document/tpl/document_list.html b/modules/document/tpl/document_list.html
index 79fdf8339..a04a2c7c5 100644
--- a/modules/document/tpl/document_list.html
+++ b/modules/document/tpl/document_list.html
@@ -1,7 +1,6 @@
 <!--%import("filter/delete_checked.xml")-->
-<!--%import("js/document_admin.js")-->
+<!--#include("header.html")-->
 
-<h3>{$lang->document} <span class="gray">{$lang->cmd_management}</span></h3>
 
 <!-- 정보 -->
 <div class="tableSummaryType1">
diff --git a/modules/document/tpl/filter/insert_config.xml b/modules/document/tpl/filter/insert_config.xml
new file mode 100644
index 000000000..b600db293
--- /dev/null
+++ b/modules/document/tpl/filter/insert_config.xml
@@ -0,0 +1,7 @@
+<filter name="insert_config" module="document" act="procDocumentAdminInsertConfig" confirm_msg_code="confirm_submit">
+    <form />
+    <response>
+        <tag name="error" />
+        <tag name="message" />
+    </response>
+</filter>
diff --git a/modules/document/tpl/header.html b/modules/document/tpl/header.html
new file mode 100644
index 000000000..79d22e1f7
--- /dev/null
+++ b/modules/document/tpl/header.html
@@ -0,0 +1,10 @@
+<!--%import("js/document_admin.js")-->
+
+<h3>{$lang->document} <span class="gray">{$lang->cmd_management}</span></h3>
+
+<div class="header4">
+    <ul class="localNavigation">
+        <li <!--@if($act=='dispDocumentAdminList')-->class="on"<!--@end-->><a href="{getUrl('act','dispDocumentAdminList')}">{$lang->document_list}</a></li>
+        <li <!--@if($act=='dispDocumentAdminConfig')-->class="on"<!--@end-->><a href="{getUrl('act','dispDocumentAdminConfig')}">{$lang->cmd_module_config}</a></li>
+    </ul>
+</div>
diff --git a/modules/document/tpl/js/document_admin.js b/modules/document/tpl/js/document_admin.js
index de3f22c2b..b336a97ca 100644
--- a/modules/document/tpl/js/document_admin.js
+++ b/modules/document/tpl/js/document_admin.js
@@ -6,4 +6,16 @@ function doCheckAll(bToggle) {
 			if( !fo_obj[i].checked || !bToggle) fo_obj[i].checked = true; else fo_obj[i].checked = false;
 		}
     }
-}
\ No newline at end of file
+}
+
+/**
+ * @brief 모든 생성된 썸네일 삭제하는 액션 호출
+ **/
+function doDeleteAllThumbnail() {
+    exec_xml('document','procDocumentAdminDeleteAllThumbnail',new Array(), completeDeleteAllThumbnail);
+}
+
+function completeDeleteAllThumbnail(ret_obj) {
+    alert(ret_obj['message']);
+    location.reload();
+}
diff --git a/widgets/newest_images/conf/info.xml b/widgets/newest_images/conf/info.xml
index f31ef65a2..79bc1f997 100644
--- a/widgets/newest_images/conf/info.xml
+++ b/widgets/newest_images/conf/info.xml
@@ -57,6 +57,19 @@
             <description xml:lang="en">It cuts the length of subject and displays (10 letters as default).</description>
 			<description xml:lang="es">Muestra el título con el número de letras asignadas (predefinio: 10).</description>
         </var>
+        <var id="thumbnail_type">
+            <name xml:lang="ko">썸네일 생성 방법</name>
+            <description xml:lang="ko">썸네일 생성 방법을 선택할 수 있습니다. (crop : 꽉 채우기, ratio : 비율 맞추기)</description>
+            <type>select</type>
+            <options>
+                <name xml:lang="ko">Crop (채우기)</name>
+                <value>crop</value>
+            </options>
+            <options>
+                <name xml:lang="ko">Ratio (비율 맞추기)</name>
+                <value>ratio</value>
+            </options>
+        </var>
         <var id="thumbnail_width">
             <name xml:lang="ko">이미지 가로크기</name>
             <name xml:lang="jp">イメージ横幅</name>
@@ -70,6 +83,11 @@
             <description xml:lang="en">You can set the width of image. (100 as default)</description>
 			<description xml:lang="es">Usted puede definir el ancho de la imagen. (predefinido:100)</description>
         </var>
+        <var id="thumbnail_height">
+            <name xml:lang="ko">이미지 세로크기</name>
+            <description xml:lang="ko">이미지의 세로 크기를 지정할 수 있습니다. (기본 100px)</description>
+            <type>text</type>
+        </var>
         <var id="cols_list_count">
             <name xml:lang="ko">가로 이미지 수</name>
             <name xml:lang="jp">イメージ数</name>
@@ -181,12 +199,12 @@
                 <value>Y</value>
             </options>
             <options>
-            <name xml:lang="ko">표시하지 않음</name>
-            <name xml:lang="zh-CN">不显示</name>
-			<name xml:lang="en">Hide</name>
-			<name xml:lang="es">Ocultar</name>
+                <name xml:lang="ko">표시하지 않음</name>
+                <name xml:lang="zh-CN">不显示</name>
+                <name xml:lang="en">Hide</name>
+                <name xml:lang="es">Ocultar</name>
                 <value>N</value>
-                </options>
-            </var>
+            </options>
+        </var>
     </extra_vars>
 </widget>
diff --git a/widgets/newest_images/newest_images.class.php b/widgets/newest_images/newest_images.class.php
index d35cc2be2..9860ae000 100644
--- a/widgets/newest_images/newest_images.class.php
+++ b/widgets/newest_images/newest_images.class.php
@@ -19,10 +19,18 @@
             $widget_info->title_length = (int)$args->title_length;
             if(!$widget_info->title_length) $widget_info->title_length = 10;
 
+            // 썸네일 생성 방법
+            $widget_info->thumbnail_type = $args->thumbnail_type;
+            if(!$widget_info->thumbnail_type) $widget_info->thumbnail_type = 'crop';
+
             // 썸네일 가로 크기
             $widget_info->thumbnail_width = (int)$args->thumbnail_width;
             if(!$widget_info->thumbnail_width) $widget_info->thumbnail_width = 100;
 
+            // 썸네일 세로 크기
+            $widget_info->thumbnail_height = (int)$args->thumbnail_height;
+            if(!$widget_info->thumbnail_height) $widget_info->thumbnail_height = 100;
+
             // 세로 이미지 수
             $widget_info->rows_list_count = (int)$args->rows_list_count;
             if(!$widget_info->rows_list_count) $widget_info->rows_list_count = 1;
diff --git a/widgets/newest_images/skins/default/list.html b/widgets/newest_images/skins/default/list.html
index 662b09849..8b36d8ac1 100644
--- a/widgets/newest_images/skins/default/list.html
+++ b/widgets/newest_images/skins/default/list.html
@@ -23,7 +23,7 @@
                 {@ $oDocument = $widget_info->document_list[$i*$widget_info->cols_list_count + $j]}
             <td <!--@if($widget_info->rows_list_count>1)-->class="bottomBorder"<!--@end-->>
                 <!--@if($oDocument->document_srl)-->
-                <div class="thumbnail"><a href="{getUrl('','document_srl',$oDocument->document_srl)}"><img src="{$oDocument->getThumbnail($widget_info->thumbnail_width)}" width="{$widget_info->thumbnail_width}" height="{$widget_info->thumbnail_width}" border="0" alt="" class="thumbnail" /></a></div>
+                <div class="thumbnail"><a href="{getUrl('','document_srl',$oDocument->document_srl)}"><img src="{$oDocument->getThumbnail($widget_info->thumbnail_width,$widget_info->thumbnail_height,$widget_info->thumbnail_type)}" width="{$widget_info->thumbnail_width}" height="{$widget_info->thumbnail_height}" border="0" alt="" class="thumbnail" /></a></div>
 
                 <div>
                     <a href="{$oDocument->getPermanentUrl()}#{$oDocument->getCommentCount()}">{$oDocument->getTitleText($widget_info->title_length)}</a>
diff --git a/widgets/newest_images/skins/xe_official/list.html b/widgets/newest_images/skins/xe_official/list.html
index 8b7732177..a7b7d15a5 100644
--- a/widgets/newest_images/skins/xe_official/list.html
+++ b/widgets/newest_images/skins/xe_official/list.html
@@ -19,7 +19,7 @@
                 {@ $oDocument = $widget_info->document_list[$i*$widget_info->cols_list_count + $j]}
             <td <!--@if($widget_info->rows_list_count>1)-->class="bottomBorder"<!--@end-->>
                 <!--@if($oDocument->document_srl)-->
-                <div class="thumbnail"><a href="{getUrl('','document_srl',$oDocument->document_srl)}"><img src="{$oDocument->getThumbnail($widget_info->thumbnail_width)}" width="{$widget_info->thumbnail_width}" height="{$widget_info->thumbnail_width}" border="0" alt="" class="thumbnail" /></a></div>
+                <div class="thumbnail"><a href="{getUrl('','document_srl',$oDocument->document_srl)}"><img src="{$oDocument->getThumbnail($widget_info->thumbnail_width,$widget_info->thumbnail_height,$widget_info->thumbnail_type)}" width="{$widget_info->thumbnail_width}" height="{$widget_info->thumbnail_height}" border="0" alt="" class="thumbnail" /></a></div>
 
                 <div>
                     <a href="{$oDocument->getPermanentUrl()}#{$oDocument->getCommentCount()}">{$oDocument->getTitleText($widget_info->title_length)}</a>

From d58f1590ddbb937913126b4feb40751e395f0e1e Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Thu, 11 Oct 2007 03:57:41 +0000
Subject: [PATCH 25/29] =?UTF-8?q?=EA=B8=80/=EB=8C=93=EA=B8=80=EC=9D=98=20?=
 =?UTF-8?q?=EB=82=B4=EC=9A=A9=20=EC=9E=90=EB=8F=99=20=EB=A7=81=ED=81=AC=20?=
 =?UTF-8?q?=EA=B8=B0=EB=8A=A5=20=EC=A0=81=EC=9A=A9?=
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@2735 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/comment/comment.model.php  | 6 ++++++
 modules/document/document.item.php | 3 +++
 2 files changed, 9 insertions(+)

diff --git a/modules/comment/comment.model.php b/modules/comment/comment.model.php
index b8da4d706..39bf53deb 100644
--- a/modules/comment/comment.model.php
+++ b/modules/comment/comment.model.php
@@ -125,7 +125,13 @@
                 $comment_srl = $source_list[$i]->comment_srl;
                 $parent_srl = $source_list[$i]->parent_srl;
                 $member_srl = $source_list[$i]->member_srl;
+
+                // OL/LI 태그를 위한 치환 처리
                 $source_list[$i]->content = preg_replace('!<(ol|ul|blockquote)>!is','<\\1 style="margin-left:40px;">',$source_list[$i]->content);
+
+                // url에 대해서 정규표현식으로 치환
+                $source_list[$i]->content = preg_replace('!([^>^"^\'^=])(http|https|ftp|mms):\/\/([^ ^<^"^\']*)!is','$1<a href="$2://$3" onclick="window.open(this.href);return false;">$2://$3</a>',' '.$source_list[$i]->content);
+            
                 if(!$comment_srl) continue;
 
                 if($is_admin || $this->isGranted($comment_srl) || $member_srl == $logged_info->member_srl) $source_list[$i]->is_granted = true;
diff --git a/modules/document/document.item.php b/modules/document/document.item.php
index cdd4e8637..39c263238 100644
--- a/modules/document/document.item.php
+++ b/modules/document/document.item.php
@@ -186,6 +186,9 @@
 
             // OL/LI 태그를 위한 치환 처리
             $content = preg_replace('!<(ol|ul|blockquote)>!is','<\\1 style="margin-left:40px;">',$content);
+
+            // url에 대해서 정규표현식으로 치환
+            $content = preg_replace('!([^>^"^\'^=])(http|https|ftp|mms):\/\/([^ ^<^"^\']*)!is','$1<a href="$2://$3" onclick="window.open(this.href);return false;">$2://$3</a>',' '.$content);
             
             if($add_document_info) return sprintf('<!--BeforeDocument(%d,%d)-->%s<!--AfterDocument(%d,%d)-->', $this->document_srl, $this->get('member_srl'), $content, $this->document_srl, $this->get('member_srl'));
 

From 72dcf5406923ce1d97e88eda0b69939548fad6b4 Mon Sep 17 00:00:00 2001
From: haneul <syhan@cs.washington.edu>
Date: Thu, 11 Oct 2007 05:24:39 +0000
Subject: [PATCH 26/29] =?UTF-8?q?=EC=B5=9C=EA=B7=BC=EA=B8=80=20=EC=9C=84?=
 =?UTF-8?q?=EC=A0=AF=20XE=5FOfficial=20=EC=98=81=EB=AC=B8=20=EB=B2=88?=
 =?UTF-8?q?=EC=97=AD?=
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@2736 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 widgets/newest_document/skins/xe_official/skin.xml | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/widgets/newest_document/skins/xe_official/skin.xml b/widgets/newest_document/skins/xe_official/skin.xml
index 2fce8df16..ffa0ee8ef 100644
--- a/widgets/newest_document/skins/xe_official/skin.xml
+++ b/widgets/newest_document/skins/xe_official/skin.xml
@@ -3,10 +3,13 @@
   <title xml:lang="ko">XE 공식 레이아웃용 최신글 스킨</title>
   <title xml:lang="jp">XEデフォルトレイアウト用の最新コンテンツ表示スキン</title>
   <title xml:lang="zh-CN">XE 官方网站主题列表</title>
+  <title xml:lang="en">XE Official Layout's newest document skin</title>
+    
   <maker email_address="zero@zeroboard.com" link="http://www.zeroboard.com" date="2007. 8. 1">
     <name xml:lang="ko">제로</name>
-    <name xml:lang="jp">Zero</name>
+    <name xml:lang="jp">zero</name>
     <name xml:lang="zh-CN">zero</name>
+    <name xml:lang="en">zero</name>
     <description xml:lang="ko">
         XE 공식 레이아웃에 적합한 최신글 스킨입니다.
         디자인 : 이소라 (http://ra-ra.pe.kr)
@@ -25,17 +28,24 @@
         HTML/CSS : Chan-Myung Jeong(http://naradesign.net)
         布局: zero (http://blog.nzeo.com)
     </description>
+    <description xml:lang="en">
+	It is a skin suitable for the XE official layout.
+	Design : So-Ra Lee (http://ra-ra-.pe.kr)
+	HTML/CSS : Chan-Myung Jeong(http://naradesign.net)
+	Layout : zero (http://blog.nzeo.com)
   </maker>
   <colorset>
     <color name="white">
       <title xml:lang="ko">흰색 바탕용</title>
       <title xml:lang="jp">白い背景</title>
       <title xml:lang="zh-CN">白色背景</title>
+      <title xml:lang="en">White Background</title>
     </color>
     <color name="black">
       <title xml:lang="ko">어두운 바탕용</title>
       <title xml:lang="jp">暗い背景</title>
       <title xml:lang="zh-CN">暗色背景</title>
+      <title xml:lang="en">Dark Background</title>
     </color>
   </colorset>
 </skin>

From 14550e198f84526a6fed03aeaf62165bac710dcf Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Thu, 11 Oct 2007 09:13:02 +0000
Subject: [PATCH 27/29] =?UTF-8?q?#127=20#152=20=EA=B2=8C=EC=8B=9C=EB=AC=BC?=
 =?UTF-8?q?=EC=9D=98=20=EB=B3=B5=EC=82=AC=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94?=
 =?UTF-8?q?=EA=B0=80=20&=20=EC=9D=B4=EB=8F=99/=EB=B3=B5=EC=82=AC=EC=8B=9C?=
 =?UTF-8?q?=20=EC=B9=B4=ED=85=8C=EA=B3=A0=EB=A6=AC=20=EC=A7=80=EC=A0=95=20?=
 =?UTF-8?q?=EA=B0=80=EB=8A=A5=ED=95=98=EB=8F=84=EB=A1=9D=20=EB=B3=80?=
 =?UTF-8?q?=EA=B2=BD=20&=20=EA=B8=B0=EB=B3=B8=20=EA=B2=8C=EC=8B=9C?=
 =?UTF-8?q?=ED=8C=90=20=EC=8A=A4=ED=82=A8=EC=97=90=EC=84=9C=20=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9D=98=20=EA=B2=8C=EC=8B=9C=EB=AC=BC=20?=
 =?UTF-8?q?=ED=86=A0=EA=B8=80=20=EA=B8=B0=EB=8A=A5=20=EC=B6=94=EA=B0=80=20?=
 =?UTF-8?q?&=20=EA=B4=80=EB=A6=AC=20=EC=84=A0=ED=83=9D=EB=90=9C=20?=
 =?UTF-8?q?=EA=B2=8C=EC=8B=9C=EB=AC=BC=EC=9D=98=20=EB=AA=A9=EB=A1=9D=20?=
 =?UTF-8?q?=EB=85=B8=EC=B6=9C=20&=20=EA=B8=B0=EB=B3=B8=20=EA=B2=8C?=
 =?UTF-8?q?=EC=8B=9C=ED=8C=90=20=EC=8A=A4=ED=82=A8=EC=9D=98=20=ED=95=AD?=
 =?UTF-8?q?=EB=AA=A9=20=EC=88=A8=EA=B9=80/=EC=97=B4=EB=9E=8C=20=EA=B8=B0?=
 =?UTF-8?q?=EB=8A=A5=20=EB=AA=A8=EB=91=90=20=EC=A0=81=EC=9A=A9?=
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@2737 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 common/js/common.js                           |  12 +-
 common/lang/ko.lang.php                       |   4 +-
 modules/board/board.admin.controller.php      |  81 --------
 modules/board/board.admin.view.php            |  28 ---
 modules/board/board.view.php                  |   5 -
 modules/board/conf/module.xml                 |   5 -
 modules/board/lang/en.lang.php                |   1 -
 modules/board/lang/es.lang.php                |   1 -
 modules/board/lang/jp.lang.php                |   1 -
 modules/board/lang/ko.lang.php                |   1 -
 modules/board/lang/zh-CN.lang.php             |   1 -
 modules/board/skins/xe_gallery/css/common.css |  32 +--
 modules/board/skins/xe_gallery/js/board.js    |  13 --
 modules/board/skins/xe_gallery/list.html      | 129 ++++++------
 modules/board/skins/xe_gallery/skin.xml       |  45 +++++
 modules/board/skins/xe_list/css/common.css    |   4 +-
 modules/board/skins/xe_list/js/board.js       |  13 --
 modules/board/skins/xe_list/list.html         |  33 ++--
 modules/board/skins/xe_webzine/css/common.css |  14 +-
 modules/board/skins/xe_webzine/js/board.js    |  13 --
 modules/board/skins/xe_webzine/list.html      |  85 ++++----
 modules/board/skins/xe_webzine/skin.xml       |  54 +++++
 modules/board/tpl/checked_list.html           |  53 -----
 modules/board/tpl/js/board_admin.js           |  14 --
 modules/document/conf/module.xml              |  13 ++
 .../document/document.admin.controller.php    | 186 +++++++++++++++---
 modules/document/document.admin.view.php      |  35 ++++
 modules/document/document.class.php           |   7 +-
 modules/document/document.item.php            |  17 ++
 modules/document/document.model.php           |  15 ++
 modules/document/lang/en.lang.php             |   1 +
 modules/document/lang/es.lang.php             |   1 +
 modules/document/lang/jp.lang.php             |   1 +
 modules/document/lang/ko.lang.php             |   2 +
 modules/document/lang/zh-CN.lang.php          |   1 +
 modules/document/queries/getAllModules.xml    |  14 ++
 .../document/queries/updateDocumentModule.xml |   3 +-
 modules/document/tpl/checked_list.html        |  74 +++++++
 modules/document/tpl/css/document.css         |   6 +-
 .../tpl/filter/manage_checked_document.xml    |   7 +
 modules/document/tpl/js/document_admin.js     |  49 +++++
 41 files changed, 678 insertions(+), 396 deletions(-)
 delete mode 100644 modules/board/tpl/checked_list.html
 create mode 100644 modules/document/queries/getAllModules.xml
 create mode 100644 modules/document/tpl/checked_list.html
 create mode 100644 modules/document/tpl/filter/manage_checked_document.xml

diff --git a/common/js/common.js b/common/js/common.js
index 3d129e9c0..b3a07e38b 100644
--- a/common/js/common.js
+++ b/common/js/common.js
@@ -649,6 +649,16 @@ function checkboxSelectAll(form, name, option){
         else if(option == true) value = true
         else if(option == false) value = false
 
-        if(fo_obj[i].name == name) fo_obj[i].checked = value;
+        //if(fo_obj[i].name == name) fo_obj[i].checked = value;
+        if(fo_obj[i].name == name) fo_obj[i].click();
     }
 }
+
+/* 관리자가 문서를 관리하기 위해서 선택시 세션에 넣음 */
+function doAddDocumentCart(obj) {
+    var srl = obj.value;
+    var params = new Array();
+    params["srl"] = srl;
+    exec_xml("document","procDocumentAdminAddCart", params, null);
+}
+
diff --git a/common/lang/ko.lang.php b/common/lang/ko.lang.php
index 9cf83d210..1bdffd515 100644
--- a/common/lang/ko.lang.php
+++ b/common/lang/ko.lang.php
@@ -177,8 +177,8 @@
     $lang->success_reset = '초기화되었습니다';
     $lang->success_leaved = '탈퇴되었습니다';
 
-    $lang->fail_to_delete = '삭제되었습니다';
-    $lang->fail_to_move = '이동되었습니다';
+    $lang->fail_to_delete = '삭제 실패하였습니다';
+    $lang->fail_to_move = '이동 실패하였습니다';
 
     $lang->failed_voted = '추천하실 수 없습니다';
     $lang->fail_to_delete_have_children = '답글이 있어서 삭제할 수 없습니다';
diff --git a/modules/board/board.admin.controller.php b/modules/board/board.admin.controller.php
index 8148d0746..758e2f3a0 100644
--- a/modules/board/board.admin.controller.php
+++ b/modules/board/board.admin.controller.php
@@ -13,87 +13,6 @@
         function init() {
         }
 
-        /**
-         * @brief 관리자가 글 선택시 세션에 담음
-         **/
-        function procBoardAdminAddCart() {
-            $document_srl = Context::get('srl');
-            $check_flag = Context::get('check_flag');
-            if(!$document_srl || !in_array($check_flag, array('add','remove'))) return;
-
-            $flag_list = $_SESSION['document_management'][$this->module_srl];
-
-            if($check_flag == 'remove') unset($flag_list[$document_srl]);
-            else $flag_list[$document_srl] = true;
-
-            $_SESSION['document_management'][$this->module_srl] = $flag_list;
-        }
-
-        /**
-         * @brief 세션에 담긴 선택글의 이동/ 삭제
-         **/
-        function procBoardAdminManageCheckedDocument() {
-            $type = Context::get('type');
-            $module_srl = Context::get('target_board');
-            $message_content = Context::get('message_content');
-            if($message_content) $message_content = nl2br($message_content);
-
-            $flag_list = $_SESSION['document_management'][$this->module_srl];
-
-            $document_srl_list = array_keys($flag_list);
-            $document_srl_count = count($document_srl_list);
-
-            // 쪽지 발송
-            if($message_content) {
-
-                $oMemberController = &getController('member');
-                $oDocumentModel = &getModel('document');
-
-                $logged_info = Context::get('logged_info');
-
-                $title = cut_str($message_content,10,'...');
-                $sender_member_srl = $logged_info->member_srl;
-
-                for($i=0;$i<$document_srl_count;$i++) {
-                    $document_srl = $document_srl_list[$i];
-                    $oDocument = $oDocumentModel->getDocument($document_srl);
-                    if(!$oDocument->get('member_srl') || $oDocument->get('member_srl')==$sender_member_srl) continue;
-
-                    if($type=='move') $purl = sprintf("<a href=\"%s\" onclick=\"window.open(this.href);return false;\">%s</a>", $oDocument->getPermanentUrl(), $oDocument->getPermanentUrl());
-                    else $purl = "";
-                    $content .= sprintf("<div>%s</div><hr />%s<div style=\"font-weight:bold\">%s</div>%s",$message_content, $purl, $oDocument->getTitleText(), $oDocument->getContent());
-
-                    $oMemberController->sendMessage($sender_member_srl, $oDocument->get('member_srl'), $title, $content, false);
-                }
-            }
-
-            if($type == 'move') {
-                $oDocumentAdminController = &getAdminController('document');
-                if(!$module_srl) return new Object(-1, 'fail_to_move');
-                else {
-                    $output = $oDocumentAdminController->moveDocumentModule($document_srl_list, $module_srl, $this->module_srl);
-                    if(!$output->toBool()) return new Object(-1, 'fail_to_move');
-                    $msg_code = 'success_moved';
-                    $_SESSION['document_management'] = null;
-                }
-
-            } elseif($type =='delete') {
-                $oDB = &DB::getInstance();
-                $oDB->begin();
-                $oDocumentController = &getController('document');
-                for($i=0;$i<$document_srl_count;$i++) {
-                    $document_srl = $document_srl_list[$i];
-                    $output = $oDocumentController->deleteDocument($document_srl, true);
-                    if(!$output->toBool()) return new Object(-1, 'fail_to_delete');
-                }
-                $oDB->commit();
-                $msg_code = 'success_deleted';
-                $_SESSION['document_management'] = null;
-            }
-
-            $this->setMessage($msg_code);
-        }
- 
         /**
          * @brief 권한 추가
          **/
diff --git a/modules/board/board.admin.view.php b/modules/board/board.admin.view.php
index 4f0d270db..0ad07286a 100644
--- a/modules/board/board.admin.view.php
+++ b/modules/board/board.admin.view.php
@@ -209,33 +209,5 @@
 
             $this->setTemplateFile('grant_list');
         }
-
-        /**
-         * @brief 선택한 목록 출력
-         **/
-        function dispBoardAdminManageDocument() {
-            // 선택한 목록을 세션에서 가져옴
-            $flag_list = $_SESSION['document_management'][$this->module_srl];
-
-            // 목록이 있으면 게시글을 가져옴
-            if(count($flag_list)) $document_srl_list = array_keys($flag_list);
-            if(is_array($document_srl_list) && count($document_srl_list)) {
-                $oDocumentModel = &getModel('document');
-                $document_list = $oDocumentModel->getDocuments($document_srl_list, $this->grant->is_admin);
-                Context::set('document_list', $document_list);
-            }
-
-            // 게시판의 목록을 가져옴
-            $output = executeQuery('board.getAllBoard', $args);
-            $board_list = $output->data;
-            if($board_list && !is_array($board_list)) $board_list = array($board_list);
-            Context::set('board_list', $board_list);
-
-            // 팝업 레이아웃 선택
-            $this->setLayoutPath('./common/tpl');
-            $this->setLayoutFile('popup_layout');
-
-            $this->setTemplateFile('checked_list');
-        }
     }
 ?>
diff --git a/modules/board/board.view.php b/modules/board/board.view.php
index 81d28955b..a97638159 100644
--- a/modules/board/board.view.php
+++ b/modules/board/board.view.php
@@ -156,11 +156,6 @@
             Context::set('document_list', $output->data);
             Context::set('page_navigation', $output->page_navigation);
 
-            // 관리자일 경우 체크한 문서들의 목록을 세팅
-            if($this->grant->is_admin) {
-                Context::set('check_list',$_SESSION['document_management'][$this->module_srl]);
-            }
-
             $this->setTemplateFile('list');
         }
         
diff --git a/modules/board/conf/module.xml b/modules/board/conf/module.xml
index 62faafb6b..3f4280aaa 100644
--- a/modules/board/conf/module.xml
+++ b/modules/board/conf/module.xml
@@ -67,13 +67,11 @@
         <permission action="dispBoardAdminBoardInfo" target="manager" />
         <permission action="dispBoardAdminSkinInfo" target="manager" />
         <permission action="dispBoardAdminCategoryInfo" target="manager" />
-        <permission action="dispBoardAdminManageDocument" target="manager" />
 
         <permission action="procBoardAdminInsertBoard" target="manager" />
         <permission action="procBoardAdminUpdateSkinInfo" target="manager" />
         <permission action="procBoardAdminInsertCategory" target="manager" />
         <permission action="procBoardAdminUpdateCategory" target="manager" />
-        <permission action="procBoardAdminManageCheckedDocument" target="manager" />
     </permissions>
     <actions>
         <action name="dispBoardContent" type="view" index="true" />
@@ -103,15 +101,12 @@
         <action name="dispBoardAdminSkinInfo" type="view" standalone="true" />
         <action name="dispBoardAdminCategoryInfo" type="view" standalone="true" />
         <action name="dispBoardAdminGrantInfo" type="view" standalone="true" />
-        <action name="dispBoardAdminManageDocument" type="view" />
 
-        <action name="procBoardAdminAddCart" type="controller" standalone="true" />
         <action name="procBoardAdminInsertGrant" type="controller" standalone="true" />
         <action name="procBoardAdminUpdateSkinInfo" type="controller" standalone="true" />
         <action name="procBoardAdminInsertBoard" type="controller" standalone="true" />
         <action name="procBoardAdminDeleteBoard" type="controller" standalone="true" />
         <action name="procBoardAdminInsertCategory" type="controller" standalone="true" />
         <action name="procBoardAdminUpdateCategory" type="controller" standalone="true" />
-        <action name="procBoardAdminManageCheckedDocument" type="controller" standalone="true" />
     </actions>
 </module>
diff --git a/modules/board/lang/en.lang.php b/modules/board/lang/en.lang.php
index bbedb7395..7bed1c139 100644
--- a/modules/board/lang/en.lang.php
+++ b/modules/board/lang/en.lang.php
@@ -11,7 +11,6 @@
     $lang->cmd_board_list = 'Board list';
     $lang->cmd_module_config = 'Common board setting';
     $lang->cmd_view_info = 'Board info';
-    $lang->move_target_module = "Target module for changing position";
 
     $lang->about_board = "This module is for creating and managing boards.\nSelect the module's name from the list after creating one to configurate specifically.\nBe careful with board's module name, since it will be the url. (ex : http://domain/zb/?mid=modulename)";
 ?>
diff --git a/modules/board/lang/es.lang.php b/modules/board/lang/es.lang.php
index eaa50f823..5615a0be2 100644
--- a/modules/board/lang/es.lang.php
+++ b/modules/board/lang/es.lang.php
@@ -11,7 +11,6 @@
     $lang->cmd_board_list = 'Lista del tableros';
     $lang->cmd_module_config = 'Configuración común del Tablero';
     $lang->cmd_view_info = 'Información del Tablero';
-    $lang->move_target_module = "Módulo para cambiar de posición";
 
     $lang->about_board = "Este módulo es para crear y manejar los tableros.\nLuego de crear un Tablero, seleciona el nombre del módulo para la configuración más detallada.\nSea cuidadoso con el nombre del módulo, ya que ese nombre va a ser la dirección URL. (ej : http://dominio/zb/?mid=nombre del módulo)";
 ?>
diff --git a/modules/board/lang/jp.lang.php b/modules/board/lang/jp.lang.php
index 1ea144b4f..d07d9aaa1 100644
--- a/modules/board/lang/jp.lang.php
+++ b/modules/board/lang/jp.lang.php
@@ -11,7 +11,6 @@
     $lang->cmd_board_list = '掲示板リスト';
     $lang->cmd_module_config = '掲示板共通設定';
     $lang->cmd_view_info = '掲示板情報';
-    $lang->move_target_module = "移動対象モジュール";
 
     $lang->about_board = "掲示板を生成、管理できる掲示板モジュールです。生成後、リストからモジュール名を選択すると詳細な設定ができます。掲示板のモジュール名はＵＲＬになりますので注意してください。 (ex : http://ドメイン/zb/?mid=モジュール名)";
 ?>
diff --git a/modules/board/lang/ko.lang.php b/modules/board/lang/ko.lang.php
index 3a1e1070f..22dae66e2 100644
--- a/modules/board/lang/ko.lang.php
+++ b/modules/board/lang/ko.lang.php
@@ -11,7 +11,6 @@
     $lang->cmd_board_list = '게시판 목록';
     $lang->cmd_module_config = '게시판  공통 설정';
     $lang->cmd_view_info = '게시판 정보';
-    $lang->move_target_module = "이동 대상 모듈";
 
     $lang->about_board = "게시판을 생성하고 관리할 수 있는 게시판 모듈입니다.\n생성하신 후 목록에서 모듈이름을 선택하시면 자세한 설정이 가능합니다.\n게시판의 모듈이름은 접속 url이 되므로 신중하게 입력해주세요. (ex : http://도메인/zb/?mid=모듈이름)";
 ?>
diff --git a/modules/board/lang/zh-CN.lang.php b/modules/board/lang/zh-CN.lang.php
index 91f16a674..dcb4f61e6 100644
--- a/modules/board/lang/zh-CN.lang.php
+++ b/modules/board/lang/zh-CN.lang.php
@@ -11,7 +11,6 @@
     $lang->cmd_board_list = '版面目录';
     $lang->cmd_module_config = '版面共同设置';
     $lang->cmd_view_info = '版面信息';
-    $lang->move_target_module = "移动目标模块";
 
     $lang->about_board = "可生成，管理版面的模块。\n生成版面后，点击模块名即可对其详细设置。";
 ?>
diff --git a/modules/board/skins/xe_gallery/css/common.css b/modules/board/skins/xe_gallery/css/common.css
index 78eedb5cb..80a592e2f 100644
--- a/modules/board/skins/xe_gallery/css/common.css
+++ b/modules/board/skins/xe_gallery/css/common.css
@@ -40,12 +40,11 @@ Jeong, Chan Myeong 070601~070630
 .boardList tr.bg2 { background:#fbfbfb;}
 .boardList th a { color:#3e3f3e; text-decoration:none; }
 .boardList th.num { background-position:-3px bottom; border-left:1px solid #ffffff; }
-.boardList th.title { text-align:center; }
-.boardList th.category { text-align:center; }
+.boardList th.title { text-align:left; padding-left:2em;}
+.boardList th.category { text-align:left; padding-left:2em;}
 .boardList th.title select { vertical-align:middle; margin-left:.5em; }
 .boardList th.reading { white-space:nowrap;}
 .boardList th.recommend { white-space:nowrap;}
-.boardList th.date { border-right:1px solid #ffffff;}
 .boardList th .sort { padding:0 .2em; vertical-align:middle;}
 .boardList td { border-top:1px solid #eff0ed; padding:.5em;}
 .boardList td.num { font:.8em tahoma; color:#999999; padding:.5em 1em; text-align:center;}
@@ -77,19 +76,20 @@ Jeong, Chan Myeong 070601~070630
 .boardList td .thumbnailMedium { margin:0 .3em 0 .3em;}
 .boardList td .thumbnailMedium img { border:1px solid #e0e1db; padding:3px;}
 
-.boardList.thumbnail { margin-top:-1px; border-bottom:none;}
-.boardList.thumbnail td { border-top:none; border-bottom:1px solid #eff0ed; padding:1.5em 0 0 1.5em; overflow:hidden;}
-.boardList.thumbnail div.cell { float:left; width:167px; height:220px; overflow:hidden; margin:0 1.5em 0 0; padding-bottom:1.5em;}
-.boardList.thumbnail div.cell img.thumb { padding:2px; border:1px solid #e0e1db; display:block; margin-bottom:1em;}
-.boardList.thumbnail div.title { color:#444444; margin-bottom:.2em; padding-left:3px; overflow:hidden; white-space:nowrap;}
-.boardList.thumbnail div.title a { color:#444444; text-decoration:none;}
-.boardList.thumbnail div.nameAndDate { font-size:.9em; color:#999999; margin-bottom:.2em; padding-left:3px;}
-.boardList.thumbnail div.nameAndDate a { color:#999999;}
-.boardList.thumbnail div.nameAndDate .date { font:.8em Tahoma; color:#999999;}
-.boardList.thumbnail div.readAndRecommend { font-size:.9em; color:#666666; padding-left:3px;}
-.boardList.thumbnail div.readAndRecommend .num { font:.8em Tahoma;}
-.boardList.thumbnail div.readAndRecommend .vr { color:#dddddd;}
-.boardList.thumbnail div.readAndRecommend strong.num { font:bold .8em Tahoma; color:#ff6600;}
+.thumbnailBox { border-top:none; border-bottom:1px solid #eff0ed; padding:1.5em 0 0 1.5em; overflow:hidden; padding-bottom:1em;}
+.thumbnailBox div.cell { display:block; float:left; overflow:hidden; margin-bottom:1em;}
+.thumbnailBox div.cell img.thumb { padding:2px; border:1px solid #e0e1db; display:block; margin-bottom:1em; margin-left:auto;margin-right:auto;}
+.thumbnailBox div.title { color:#3B96C0; margin-bottom:.2em; overflow:hidden; white-space:nowrap; text-align:center;}
+.thumbnailBox div.title a { color:#3B96C0; text-decoration:none;}
+.thumbnailBox div.nameAndDate { font-size:.9em; color:#999999; margin-bottom:.2em; text-align:center;}
+.thumbnailBox div.nameAndDate a { color:#999999;}
+.thumbnailBox div.nameAndDate .author { margin-left:auto; margin-right:right; }
+.thumbnailBox div.nameAndDate .author div { display:inline; vertical-align:middle;}
+.thumbnailBox div.nameAndDate .date { font:.8em Tahoma; color:#999999;}
+.thumbnailBox div.readAndRecommend { font-size:.9em; color:#666666; text-align:center;}
+.thumbnailBox div.readAndRecommend .num { font:.8em Tahoma;}
+.thumbnailBox div.readAndRecommend .vr { color:#dddddd;}
+.thumbnailBox div.readAndRecommend strong.num { font:bold .8em Tahoma; color:#ff6600;}
 
 /* pageNavigation */
 .pageNavigation { display:block; padding:1.5em 0 2em 0; text-align:center; font:bold 11px Tahoma; }
diff --git a/modules/board/skins/xe_gallery/js/board.js b/modules/board/skins/xe_gallery/js/board.js
index 9044d6484..81c8d2099 100644
--- a/modules/board/skins/xe_gallery/js/board.js
+++ b/modules/board/skins/xe_gallery/js/board.js
@@ -4,19 +4,6 @@
  * @brief  board 모듈의 javascript
  **/
 
-/* 관리자가 카트 선택시 세션에 넣음 */
-function doAddCart(mid, obj) {
-    var srl = obj.value;
-    var check_flag = obj.checked?'add':'remove';
-
-    var params = new Array();
-    params["mid"] = mid;
-    params["srl"] = srl;
-    params["check_flag"] = check_flag;
-
-    exec_xml("board","procBoardAdminAddCart", params, null);
-}
-
 /* 글쓰기 작성후 */
 function completeDocumentInserted(ret_obj) {
     var error = ret_obj['error'];
diff --git a/modules/board/skins/xe_gallery/list.html b/modules/board/skins/xe_gallery/list.html
index 9edf2d6ec..1dce07363 100644
--- a/modules/board/skins/xe_gallery/list.html
+++ b/modules/board/skins/xe_gallery/list.html
@@ -10,17 +10,21 @@
 <!--@end-->
 
 <!-- 목록 출력 -->
-<table cellspacing="0" summary="" class="boardList">
-    <col width="50" />
+<form action="./" method="get">
+    <table cellspacing="0" summary="" class="boardList">
+    <col width="80" />
     <col />
-    <col width="90" />
-    <col width="90" />
-    <col width="110" />
+    <!--@if($module_info->display_readed_count!='N')--><col width="70" /><!--@end-->
+    <!--@if($module_info->display_voted_count!='N')--><col width="70" /><!--@end-->
+    <!--@if($module_info->display_regdate != 'N')--><col width="90" /><!--@end-->
+    <!--@if($module_info->display_last_update == 'Y')--><col width="90" /><!--@end-->
     <thead>
         <tr>
-            <th scope="col" class="title thumbStyle" colspan="2">
+            <th scope="col" class="<!--@if($module_info->use_category=='Y')-->category<!--@else-->title<!--@end-->" colspan="2">
+                <!--@if($grant->is_admin)-->
+                <input type="checkbox" onclick="checkboxSelectAll(this.form, 'cart'); return false;" />
+                <!--@end-->
                 <!--@if($module_info->use_category == "Y")-->
-                <form action="./" method="get">
                     <select name="category" id="board_category">
                         <option value="">{$lang->category}</option>
                         <!--@foreach($category_list as $val)-->
@@ -28,7 +32,6 @@
                         <!--@end-->
                     </select>
                     <input type="button" name="go_button" id= "go_button" value="GO" onclick="doChangeCategory(); return false;" class="buttonTypeGo" />
-                </form>
                 <!--@else-->
                 {$lang->title}
                 <!--@end-->
@@ -42,11 +45,12 @@
                 {@ $order_type = "desc"; }
             <!--@end-->
 
-            <th class="reading" scope="col"><a href="{getUrl('sort_index','readed_count','order_type',$order_type)}">{$lang->readed_count}<!--@if($sort_index=='readed_count')--><img src="./images/common/{$order_icon}" alt="" width="5" height="3" class="sort" /><!--@end--></a></th>
+            <!--@if($module_info->display_readed_count!='N')--><th class="reading" scope="col"><a href="{getUrl('sort_index','readed_count','order_type',$order_type)}">{$lang->readed_count}<!--@if($sort_index=='readed_count')--><img src="./images/common/{$order_icon}" alt="" width="5" height="3" class="sort" /><!--@end--></a></th><!--@end-->
 
-            <th class="recommend" scope="col"><a href="{getUrl('sort_index','voted_count','order_type',$order_type)}">{$lang->voted_count}<!--@if($sort_index=='voted_count')--><img src="./images/common/{$order_icon}" alt="" width="5" height="3" class="sort" /><!--@end--></a></th>
+            <!--@if($module_info->display_voted_count!='N')--><th class="recommend" scope="col"><a href="{getUrl('sort_index','voted_count','order_type',$order_type)}">{$lang->voted_count}<!--@if($sort_index=='voted_count')--><img src="./images/common/{$order_icon}" alt="" width="5" height="3" class="sort" /><!--@end--></a></th><!--@end-->
 
-            <th scope="col" class="date"><a href="{getUrl('sort_index','regdate','order_type',$order_type)}">{$lang->date}<!--@if($sort_index=='regdate')--><img src="./images/common/{$order_icon}" alt="" width="5" height="3" class="sort" /><!--@end--></a></th>
+            <!--@if($module_info->display_regdate!='N')--><th scope="col" class="date"><a href="{getUrl('sort_index','regdate','order_type',$order_type)}">{$lang->date}<!--@if($sort_index=='regdate')--><img src="./images/common/{$order_icon}" alt="" width="5" height="3" class="sort" /><!--@end--></a></th><!--@end-->
+            <!--@if($module_info->display_last_update=='Y')--><th scope="col" class="date"><a href="{getUrl('sort_index','last_update','order_type',$order_type)}">{$lang->last_update}<!--@if($sort_index=='last_update')--><img src="./images/common/{$order_icon}" alt="" width="5" height="3" class="sort" /><!--@end--></a></th><!--@end-->
         </tr>
     </thead>
 
@@ -58,7 +62,11 @@
             <td class="num">{$lang->notice}</td>
             <td class="title">
                 <!--@if($grant->is_admin)-->
-                    <input type="checkbox" value="{$document->document_srl}" onclick="doAddCart('{$mid}',this)" <!--@if($check_list[$document->document_srl])-->checked="checked"<!--@end--> /> 
+                    <input type="checkbox" name="cart" value="{$document->document_srl}" onclick="doAddDocumentCart(this)" <!--@if($document->isCarted())-->checked="checked"<!--@end--> /> 
+                <!--@end-->
+
+                <!--@if($module_info->use_category == "Y" && $document->get('category_srl'))-->
+                <strong class="category">{$category_list[$document->get('category_srl')]->title}</strong>
                 <!--@end-->
 
                 <a href="{getUrl('document_srl',$document->document_srl)}">{$document->getTitleText($module_info->subject_cut_size)}</a>
@@ -73,9 +81,10 @@
 
                 {$document->printExtraImages(60*60*$module_info->duration_new)}
             </td>
-            <td class="reading">{$document->get('readed_count')}</td>
-            <td class="recommend">{$document->get('voted_count')}</td>
-            <td class="date">{$document->getRegdate('Y-m-d')}</td>
+            <!--@if($module_info->display_readed_count!='N')--><td class="reading">{$document->get('readed_count')}</td><!--@end-->
+            <!--@if($module_info->display_voted_count!='N')--><td class="recommend">{$document->get('voted_count')}</td><!--@end-->
+            <!--@if($module_info->display_regdate!='N')--><td class="date">{$document->getRegdate('Y-m-d')}</td><!--@end-->
+            <!--@if($module_info->display_last_update=='Y')--><td class="date">{zdate($document->get('last_update'),'Y-m-d H:i')}</td><!--@end-->
         </tr>
 
         <!--@end-->
@@ -84,55 +93,59 @@
     </tbody>
 </table>
 
-<table cellspacing="0" class="boardList thumbnail">
-    <tbody>
-        <tr class="bg1">
-            <td>
-                <!--@foreach($document_list as $no => $document)-->
-                <!--@if(!$document->isNotice())-->
+{@ $height = $module_info->thumbnail_height + 40; }
+<!--@if($module_info->display_author!='N' || $module_info->display_regdate!='N')-->{@ $height += 25 }<!--@end-->
+<!--@if($module_info->display_readed_count !='N' || $module_info->display_voted_count!='N')-->{@ $height += 25 }<!--@end-->
 
-                <div class="cell">
-                    <!--@if($document->thumbnailExists($module_info->thumbnail_width, $module_info->thumbnail_height, $module_info->thumbnail_type))-->
-                        <a href="{getUrl('','document_srl',$document->document_srl)}"><img src="{$document->getThumbnail($module_info->thumbnail_width, $module_info->thumbnail_height, $module_info->thumbnail_type)}" border="0" alt="" class="thumb"/></a>
-                    <!--@else-->
-                        <img src="./images/blank.gif" border="0" alt="" class="thumb" width="{$module_info->thumbnail_width}" height="{$module_info->thumbnail_height}" />
-                    <!--@end-->
 
-                    <div class="title">
-                        <!--@if($grant->is_admin)-->
-                            <input type="checkbox" value="{$document->document_srl}" onclick="doAddCart('{$mid}',this)" <!--@if($check_list[$document->document_srl])-->checked="checked"<!--@end--> /> 
-                        <!--@end-->
-                        <!--@if($grant->view)-->
-                            <a href="{getUrl('document_srl',$document->document_srl)}">{$document->getTitleText($module_info->subject_cut_size)}</a>
-                        <!--@else-->
-                            {$document->getTitleText(8,'')}
-                        <!--@end-->
+<div class="thumbnailBox">
 
-                        <!--@if($document->getCommentCount())-->
-                            <span class="replyAndTrackback" title="Replies">(<strong>{$document->getCommentCount()}</strong>)</span>
-                        <!--@end-->
+    <!--@foreach($document_list as $no => $document)-->
+    <!--@if(!$document->isNotice())-->
 
-                        <!--@if($document->getTrackbackCount())-->
-                            <span class="replyAndTrackback" title="Trackbacks">[<strong>{$document->getTrackbackCount()}</strong>]</span>
-                        <!--@end-->
-
-                        <div class="nameAndDate">
-                            <div class="author member_{$document->get('member_srl')}">{$document->getNickName()}</div>
-                            <div class="date">{$document->getRegdate('Y.m.d')}</div>
-                        </div>
-                    </div>
-                    <div class="readAndRecommend">
-                        {$lang->readed_count} <span class="num">{$document->get('readed_count')}</span>
-                        <!--@if($document->get('voted_count'))--><span class="vr">|</span> {$lang->voted_count} <strong class="num">{$document->get('voted_count')}</strong><!--@end-->
-                    </div>
-                </div>
+    <div class="cell" style="width:{$module_info->thumbnail_width+30}px;height:{$height}px;">
+        <!--@if($document->thumbnailExists($module_info->thumbnail_width, $module_info->thumbnail_height, $module_info->thumbnail_type))-->
+            <a href="{getUrl('','document_srl',$document->document_srl)}"><img src="{$document->getThumbnail($module_info->thumbnail_width, $module_info->thumbnail_height, $module_info->thumbnail_type)}" border="0" alt="" class="thumb"/></a>
+        <!--@else-->
+            <img src="./images/blank.gif" border="0" alt="" class="thumb" width="{$module_info->thumbnail_width}" height="{$module_info->thumbnail_height}" />
+        <!--@end-->
 
+        <div class="title">
+            <!--@if($module_info->use_category == "Y" && $document->get('category_srl'))-->
+            <strong class="category">{$category_list[$document->get('category_srl')]->title}</strong><br />
             <!--@end-->
+
+            <!--@if($grant->is_admin)-->
+                <input type="checkbox" name="cart" value="{$document->document_srl}" onclick="doAddDocumentCart(this)" <!--@if($document->isCarted())-->checked="checked"<!--@end--> /> 
             <!--@end-->
-            </td>
-        </tr>
-    </tbody>
-</table>
+
+            <a href="{getUrl('document_srl',$document->document_srl)}">{$document->getTitleText($module_info->subject_cut_size)}</a>
+
+            <!--@if($document->getCommentCount())-->
+                <span class="replyAndTrackback" title="Replies">(<strong>{$document->getCommentCount()}</strong>)</span>
+            <!--@end-->
+
+            <!--@if($document->getTrackbackCount())-->
+                <span class="replyAndTrackback" title="Trackbacks">[<strong>{$document->getTrackbackCount()}</strong>]</span>
+            <!--@end-->
+
+            <div class="nameAndDate">
+                <!--@if($module_info->display_author!='N')--><div class="author"><div class="member_{$document->get('member_srl')}">{$document->getNickName()}</div></div><!--@end-->
+                <!--@if($module_info->display_regdate!='N')--><div class="date">{$document->getRegdate('Y.m.d')}</div><!--@end-->
+            </div>
+        </div>
+        <div class="readAndRecommend">
+            <!--@if($module_info->display_readed_count!='N')-->{$lang->readed_count} <span class="num">{$document->get('readed_count')}</span><!--@end-->
+            <!--@if($document->get('voted_count') && $module_info->display_voted_count!='N')-->
+                <!--@if($module_info->display_readed_count!='N')--><span class="vr">|</span> <!--@end-->
+                {$lang->voted_count} <strong class="num">{$document->get('voted_count')}</strong>
+            <!--@end-->
+        </div>
+    </div>
+    <!--@end-->
+    <!--@end-->
+</div>
+</form>
 
 
 <div class="clear">
@@ -148,7 +161,7 @@
     <!--@if($grant->is_admin)-->
     <!-- 문서 관리 버튼 -->
     <div class="gap1 fl">
-        <a href="{getUrl('act','dispBoardAdminManageDocument')}" onclick="popopen(this.href,'manageDocument'); return false;" class="button"><span>{$lang->cmd_manage_document}</span></a>
+        <a href="{getUrl('','module','document','act','dispDocumentAdminManageDocument')}" onclick="popopen(this.href,'manageDocument'); return false;" class="button"><span>{$lang->cmd_manage_document}</span></a>
     </div>
     <!--@end-->
 
diff --git a/modules/board/skins/xe_gallery/skin.xml b/modules/board/skins/xe_gallery/skin.xml
index aae0f36af..a24f95e64 100644
--- a/modules/board/skins/xe_gallery/skin.xml
+++ b/modules/board/skins/xe_gallery/skin.xml
@@ -131,5 +131,50 @@
             <description xml:lang="ko">썸네일의 세로 크기를 지정할 수 있습니다. (기본 100px)</description>
             <default>100</default>
         </var>
+        <var name="display_author" type="select">
+          <title xml:lang="ko">글쓴이 표시</title>
+          <title xml:lang="jp">投稿者表示</title>
+          <title xml:lang="zh-CN">显示昵称</title>
+          <title xml:lang="en">Display Author</title>
+          <default>Y</default>
+          <default>N</default>
+          <description />
+        </var>
+        <var name="display_regdate" type="select">
+          <title xml:lang="ko">작성일 표시</title>
+          <title xml:lang="jp">作成日表示</title>
+          <title xml:lang="zh-CN">显示发表日期</title>
+          <title xml:lang="en">Display Registered Date</title>
+          <default>Y</default>
+          <default>N</default>
+          <description />
+        </var>
+        <var name="display_readed_count" type="select">
+          <title xml:lang="ko">조회수 표시</title>
+          <title xml:lang="jp">照合数表示</title>
+          <title xml:lang="zh-CN">显示查看数</title>
+          <title xml:lang="en">Display Hit</title>
+          <default>Y</default>
+          <default>N</default>
+          <description />
+        </var>
+        <var name="display_voted_count" type="select">
+          <title xml:lang="ko">추천수 표시</title>
+          <title xml:lang="jp">推薦数表示</title>
+          <title xml:lang="zh-CN">显示推荐数</title>
+          <title xml:lang="en">Display Votes</title>
+          <default>Y</default>
+          <default>N</default>
+          <description />
+        </var>
+        <var name="display_last_update" type="select">
+          <title xml:lang="ko">최근 변경시간 표시</title>
+          <title xml:lang="jp">最近の変更時間表示</title>
+          <title xml:lang="zh-CN">显示最后更新时间</title>
+          <title xml:lang="en">Display Latest Update</title>
+          <default>N</default>
+          <default>Y</default>
+          <description />
+        </var>
     </extra_vars>
 </skin>
diff --git a/modules/board/skins/xe_list/css/common.css b/modules/board/skins/xe_list/css/common.css
index cd593eec0..521575f3a 100644
--- a/modules/board/skins/xe_list/css/common.css
+++ b/modules/board/skins/xe_list/css/common.css
@@ -40,8 +40,8 @@ Jeong, Chan Myeong 070601~070630
 .boardList tr.bg2 { background:#fbfbfb;}
 .boardList th a { color:#3e3f3e; text-decoration:none; }
 .boardList th.num { background-position:-3px bottom; border-left:1px solid #ffffff; }
-.boardList th.title { text-align:center; }
-.boardList th.category { text-align:center; }
+.boardList th.title { text-align:center; padding-left:1em; }
+.boardList th.category { text-align:left; padding-left:1em; }
 .boardList th.title select { vertical-align:middle; margin-left:.5em; }
 .boardList th.reading { white-space:nowrap;}
 .boardList th.recommend { white-space:nowrap;}
diff --git a/modules/board/skins/xe_list/js/board.js b/modules/board/skins/xe_list/js/board.js
index 9044d6484..81c8d2099 100644
--- a/modules/board/skins/xe_list/js/board.js
+++ b/modules/board/skins/xe_list/js/board.js
@@ -4,19 +4,6 @@
  * @brief  board 모듈의 javascript
  **/
 
-/* 관리자가 카트 선택시 세션에 넣음 */
-function doAddCart(mid, obj) {
-    var srl = obj.value;
-    var check_flag = obj.checked?'add':'remove';
-
-    var params = new Array();
-    params["mid"] = mid;
-    params["srl"] = srl;
-    params["check_flag"] = check_flag;
-
-    exec_xml("board","procBoardAdminAddCart", params, null);
-}
-
 /* 글쓰기 작성후 */
 function completeDocumentInserted(ret_obj) {
     var error = ret_obj['error'];
diff --git a/modules/board/skins/xe_list/list.html b/modules/board/skins/xe_list/list.html
index d69be8e9a..e9ace165a 100644
--- a/modules/board/skins/xe_list/list.html
+++ b/modules/board/skins/xe_list/list.html
@@ -10,21 +10,26 @@
 <!--@end-->
 
 <!-- 목록 출력 -->
-<table cellspacing="0" summary="" class="boardList">
-  <!--@if($module_info->display_number!='N')--><col width="80" /><!--@end-->
-  <col />
-  <!--@if($module_info->display_author!='N')--><col width="120" /><!--@end-->
-  <!--@if($module_info->display_readed_count!='N')--><col width="70" /><!--@end-->
-  <!--@if($module_info->display_voted_count!='N')--><col width="70" /><!--@end-->
-  <!--@if($module_info->display_regdate != 'N')--><col width="90" /><!--@end-->
-  <!--@if($module_info->display_last_update == 'Y')--><col width="90" /><!--@end-->
+<form action="./" method="get">
+
+    <table cellspacing="0" summary="" class="boardList">
+    <!--@if($module_info->display_number!='N')--><col width="80" /><!--@end-->
+    <col />
+    <!--@if($module_info->display_author!='N')--><col width="120" /><!--@end-->
+    <!--@if($module_info->display_readed_count!='N')--><col width="70" /><!--@end-->
+    <!--@if($module_info->display_voted_count!='N')--><col width="70" /><!--@end-->
+    <!--@if($module_info->display_regdate != 'N')--><col width="90" /><!--@end-->
+    <!--@if($module_info->display_last_update == 'Y')--><col width="90" /><!--@end-->
     <thead>
         <tr>
             <!--@if($module_info->display_number!='N')--><th scope="col" class="num">{$lang->no}</th><!--@end-->
-            <th scope="col" class="title <!--@if($module_info->use_category == 'Y')-->category<!--@end-->">
+            <th scope="col" class="<!--@if($module_info->use_category == 'Y')-->category<!--@else-->title<!--@end-->">
+                <!--@if($grant->is_admin)-->
+                <input type="checkbox" onclick="checkboxSelectAll(this.form, 'cart'); return false;" />
+                <!--@end-->
+                
                 <!--@if($module_info->use_category == "Y")-->
                 <!-- 카테고리 사용시 카테고리 선택 표시 -->
-                    <form action="./" method="get">
                         <select name="category" id="board_category">
                             <option value="">{$lang->category}</option>
                             <!--@foreach($category_list as $val)-->
@@ -32,7 +37,6 @@
                             <!--@end-->
                         </select>
                         <input type="button" name="go_button" id="go_button" value="GO" onclick="doChangeCategory(); return false;" class="buttonTypeGo" />
-                    </form>
                 <!--@else-->
                 {$lang->title}
                 <!--@end-->
@@ -83,7 +87,7 @@
 
             <td class="title">
                 <!--@if($grant->is_admin)-->
-                    <input type="checkbox" value="{$document->document_srl}" onclick="doAddCart('{$mid}',this)" <!--@if($check_list[$document->document_srl])-->checked="checked"<!--@end--> /> 
+                    <input type="checkbox" name="cart" value="{$document->document_srl}" onclick="doAddDocumentCart(this)" <!--@if($document->isCarted())-->checked="checked"<!--@end--> /> 
                 <!--@end-->
 
                 <!--@if($module_info->use_category == "Y" && $document->get('category_srl'))-->
@@ -114,7 +118,8 @@
         </tr>
     <!--@end-->
     </tbody>
-</table>
+    </table>
+</form>
 
 <div class="clear">
 
@@ -130,7 +135,7 @@
     <!--@if($grant->is_admin)-->
     <!-- 문서 관리 버튼 -->
     <div class="gap1 fl">
-        <a href="{getUrl('act','dispBoardAdminManageDocument')}" onclick="popopen(this.href,'manageDocument'); return false;" class="button"><span>{$lang->cmd_manage_document}</span></a>
+        <a href="{getUrl('','module','document','act','dispDocumentAdminManageDocument')}" onclick="popopen(this.href,'manageDocument'); return false;" class="button"><span>{$lang->cmd_manage_document}</span></a>
     </div>
     <!--@end-->
 
diff --git a/modules/board/skins/xe_webzine/css/common.css b/modules/board/skins/xe_webzine/css/common.css
index ce6f5e9f0..57fc2a75e 100644
--- a/modules/board/skins/xe_webzine/css/common.css
+++ b/modules/board/skins/xe_webzine/css/common.css
@@ -39,21 +39,19 @@ Jeong, Chan Myeong 070601~070630
 .boardList tr.bg1 { background:#ffffff}
 .boardList tr.bg2 { background:#fbfbfb;}
 .boardList th a { color:#3e3f3e; text-decoration:none; }
-.boardList th.num,
 .boardList th.title,
-.boardList th.category_title,
+.boardList th.category,
+.boardList th.num,
 .boardList th.reading,
 .boardList th.recommend,
 .boardList th.author,
 .boardList th.date { border-bottom:1px solid #e0e1db; padding:.5em;}
 
 .boardList th.num { background-position:-3px bottom; border-left:1px solid #ffffff; }
-.boardList th.title { text-align:center; }
-.boardList th.category_title { text-align:left; padding-left:10px;}
-.boardList th.category_title select { vertical-align:middle; width:200px; }
+.boardList th.title { text-align:center; padding-left:1em;}
+.boardList th.category { text-align:left; padding-left:1em;}
 .boardList th.reading { white-space:nowrap;}
 .boardList th.recommend { white-space:nowrap;}
-.boardList th.date { border-right:1px solid #ffffff;}
 .boardList th .sort { padding:0 .2em; vertical-align:middle;}
 .boardList td { border-bottom:1px solid #eff0ed; padding:.5em;}
 .boardList td.num { font:.8em tahoma; color:#999999; padding:.5em 1em; text-align:center;}
@@ -61,7 +59,7 @@ Jeong, Chan Myeong 070601~070630
 .boardList tr.notice td.notice { font-size:.9em; color:#999999; font-weight:bold; text-align:center;}
 .boardList td.thumb { padding:8px; width:145px; table-layout:fixed; white-space:nowrap;}
 .boardList td.thumb * { vertical-align:middle;}
-.boardList td.title {padding-left:1em; }
+.boardList td.title {padding-left:1em; height:1em; border-bottom:none;}
 .boardList td.title strong.category { font-size:1em; background:url(../images/common/line_1x10_e0e0e0.gif) no-repeat right 3px; padding-right:.5em; margin-right:.5em;}
 .boardList td.title.bold { font-size:1.2em; font-weight:bold;}
 .boardList td.title.bold a { position:relative; top:.3em;}
@@ -73,7 +71,7 @@ Jeong, Chan Myeong 070601~070630
 .boardList td.author a { font-size:1em; color:#333333;}
 .boardList td.reading { font:.8em Tahoma; color:#999999; text-align:center;}
 .boardList td.date { font:.8em Tahoma; color:#999999; text-align:center; white-space:nowrap;}
-.boardList td.summary { border-top:none; vertical-align:top; color:#666666; line-height:1.25em; padding-left:20px;}
+.boardList td.summary { border-top:none; vertical-align:top; color:#666666; line-height:1.25em; padding-left:1em;}
 .boardList td.summary a { color:#666666; text-decoration:none; line-height:inherit;}
 .boardList td.summary a:visited { color:#999999;}
 .boardList td input { _margin:-3px;}
diff --git a/modules/board/skins/xe_webzine/js/board.js b/modules/board/skins/xe_webzine/js/board.js
index 9044d6484..81c8d2099 100644
--- a/modules/board/skins/xe_webzine/js/board.js
+++ b/modules/board/skins/xe_webzine/js/board.js
@@ -4,19 +4,6 @@
  * @brief  board 모듈의 javascript
  **/
 
-/* 관리자가 카트 선택시 세션에 넣음 */
-function doAddCart(mid, obj) {
-    var srl = obj.value;
-    var check_flag = obj.checked?'add':'remove';
-
-    var params = new Array();
-    params["mid"] = mid;
-    params["srl"] = srl;
-    params["check_flag"] = check_flag;
-
-    exec_xml("board","procBoardAdminAddCart", params, null);
-}
-
 /* 글쓰기 작성후 */
 function completeDocumentInserted(ret_obj) {
     var error = ret_obj['error'];
diff --git a/modules/board/skins/xe_webzine/list.html b/modules/board/skins/xe_webzine/list.html
index 7ac609d04..6f3311deb 100644
--- a/modules/board/skins/xe_webzine/list.html
+++ b/modules/board/skins/xe_webzine/list.html
@@ -10,20 +10,25 @@
 <!--@end-->
 
 <!-- 목록 출력 -->
-<table cellspacing="0" summary="" class="boardList">
-  <col width="50" />
-  <col width="{$module_info->thumbnail_width+20}" />
-  <col />
-  <col width="120" />
-  <col width="60" />
-  <col width="60" />
-  <col width="80" />
+<form action="./" method="get">
+    <table cellspacing="0" summary="" class="boardList">
+    <!--@if($module_info->display_number!='N')--><col width="80" /><!--@end-->
+    <col width="{$module_info->thumbnail_width+20}" />
+    <col />
+    <!--@if($module_info->display_author!='N')--><col width="120" /><!--@end-->
+    <!--@if($module_info->display_readed_count!='N')--><col width="70" /><!--@end-->
+    <!--@if($module_info->display_voted_count!='N')--><col width="70" /><!--@end-->
+    <!--@if($module_info->display_regdate != 'N')--><col width="90" /><!--@end-->
+    <!--@if($module_info->display_last_update == 'Y')--><col width="90" /><!--@end-->
     <thead>
         <tr>
-            <th scope="col" class="num">{$lang->no}</th>
-            <th scope="col" colspan="2" class="<!--@if($module_info->use_category=='Y')-->category_title<!--@else-->title<!--@end-->">
+            <!--@if($module_info->display_number!='N')--><th scope="col" class="num">{$lang->no}</th><!--@end-->
+            <th scope="col" colspan="2" class="<!--@if($module_info->use_category=='Y')-->category<!--@else-->title<!--@end-->">
+                <!--@if($grant->is_admin)-->
+                <input type="checkbox" onclick="checkboxSelectAll(this.form, 'cart'); return false;" />
+                <!--@end-->
+
                 <!--@if($module_info->use_category == "Y")-->
-                <form action="./" method="get">
                     <select name="category" id="board_category">
                         <option value="" >{$lang->category}</option>
                         <!--@foreach($category_list as $val)-->
@@ -31,12 +36,11 @@
                         <!--@end-->
                     </select>
                     <input type="button" name="go_button" id= "go_button" value="GO" onclick="doChangeCategory(); return false;" class="buttonTypeGo" />
-                </form>
                 <!--@else-->
                 {$lang->title}
                 <!--@end-->
             </th>
-            <th class="author" scope="col">{$lang->writer}</th>
+            <!--@if($module_info->display_author!='N')--><th class="author" scope="col">{$lang->writer}</th><!--@end-->
 
             <!--@if($order_type == "desc")-->
                 {@ $order_icon = "buttonDescending.gif" }
@@ -46,11 +50,13 @@
                 {@ $order_type = "desc"; }
             <!--@end-->
 
-            <th class="reading" scope="col"><a href="{getUrl('sort_index','readed_count','order_type',$order_type)}">{$lang->readed_count}<!--@if($sort_index=='readed_count')--><img src="./images/common/{$order_icon}" alt="" width="5" height="3" class="sort" /><!--@end--></a></th>
+            <!--@if($module_info->display_readed_count!='N')--><th class="reading" scope="col"><a href="{getUrl('sort_index','readed_count','order_type',$order_type)}">{$lang->readed_count}<!--@if($sort_index=='readed_count')--><img src="./images/common/{$order_icon}" alt="" width="5" height="3" class="sort" /><!--@end--></a></th><!--@end-->
 
-            <th class="recommend" scope="col"><a href="{getUrl('sort_index','voted_count','order_type',$order_type)}">{$lang->voted_count}<!--@if($sort_index=='voted_count')--><img src="./images/common/{$order_icon}" alt="" width="5" height="3" class="sort" /><!--@end--></a></th>
+            <!--@if($module_info->display_voted_count!='N')--><th class="recommend" scope="col"><a href="{getUrl('sort_index','voted_count','order_type',$order_type)}">{$lang->voted_count}<!--@if($sort_index=='voted_count')--><img src="./images/common/{$order_icon}" alt="" width="5" height="3" class="sort" /><!--@end--></a></th><!--@end-->
 
-            <th scope="col" class="date"><a href="{getUrl('sort_index','regdate','order_type',$order_type)}">{$lang->date}<!--@if($sort_index=='regdate')--><img src="./images/common/{$order_icon}" alt="" width="5" height="3" class="sort" /><!--@end--></a></th>
+            <!--@if($module_info->display_regdate != 'N')--><th scope="col" class="date"><a href="{getUrl('sort_index','regdate','order_type',$order_type)}">{$lang->date}<!--@if($sort_index=='regdate')--><img src="./images/common/{$order_icon}" alt="" width="5" height="3" class="sort" /><!--@end--></a></th><!--@end-->
+
+            <!--@if($module_info->display_last_update=='Y')--><th scope="col" class="date"><a href="{getUrl('sort_index','last_update','order_type',$order_type)}">{$lang->last_update}<!--@if($sort_index=='last_update')--><img src="./images/common/{$order_icon}" alt="" width="5" height="3" class="sort" /><!--@end--></a></th><!--@end-->
         </tr>
     </thead>
 
@@ -58,7 +64,7 @@
     <!--@if(!$document_list)-->
     <!-- 게시물이 없으면 등록된 글이 없음을 표시 -->
         <tr class="bg0">
-            <td colspan="6" class="title">
+            <td colspan="7" class="title">
                 {$lang->no_documents}
             </td>
         </tr>
@@ -69,10 +75,10 @@
         <!--@if($document->isNotice())-->
 
         <tr class="notice">
-            <td class="num">{$lang->notice}</td>
+            <!--@if($module_info->display_number!='N')--><td class="notice">{$lang->notice}</td><!--@end-->
             <td class="title" colspan="2">
                 <!--@if($grant->is_admin)-->
-                    <input type="checkbox" value="{$document->document_srl}" onclick="doAddCart('{$mid}',this)" <!--@if($check_list[$document->document_srl])-->checked="checked"<!--@end--> /> 
+                    <input type="checkbox" name="cart" value="{$document->document_srl}" onclick="doAddDocumentCart(this)" <!--@if($document->isCarted())-->checked="checked"<!--@end--> /> 
                 <!--@end-->
                 <!--@if($module_info->use_category == "Y" && $document->get('category_srl'))-->
                 <strong class="category">{$category_list[$document->get('category_srl')]->title}</strong>
@@ -90,17 +96,19 @@
                 
                 {$document->printExtraImages(60*60*$module_info->duration_new)}
             </td>
-            <td class="author"><div class="member_{$document->get('member_srl')}">{$document->getNickName()}</div></td>
-            <td class="reading">{$document->get('readed_count')}</td>
-            <td class="recommend">{$document->get('voted_count')}</td>
-            <td class="date">{$document->getRegdate('Y-m-d')}</td>
+            <!--@if($module_info->display_author!='N')--><td class="author"><div class="member_{$document->get('member_srl')}">{$document->getNickName()}</div></td><!--@end-->
+            <!--@if($module_info->display_readed_count!='N')--><td class="reading">{$document->get('readed_count')>0?$document->get('readed_count'):'&nbsp;'}</td><!--@end-->
+            <!--@if($module_info->display_voted_count!='N')--><td class="recommend">{$document->get('voted_count')>0?$document->get('voted_count'):'&nbsp;'}</td><!--@end-->
+            <!--@if($module_info->display_regdate!='N')--><td class="date">{$document->getRegdate('Y-m-d')}</td><!--@end-->
+            <!--@if($module_info->display_last_update=='Y')--><td class="date">{zdate($document->get('last_update'),'Y-m-d H:i')}</td><!--@end-->
         </tr>
 
         <!--@else-->
 
         <tr class="bg{($no+1)%2+1}">
 
-            <td rowspan="2" class="num"><!--@if($document_srl == $document->document_srl)--><img src="./images/common/iconArrowD8.gif" alt="" border="0" /><!--@else-->{$no}<!--@end--></td>
+            <!--@if($module_info->display_number!='N')--><td rowspan="2" class="num"><!--@if($document_srl == $document->document_srl)--><img src="./images/common/iconArrowD8.gif" border="0" alt="" /><!--@else-->{$no}<!--@end--></td><!--@end-->
+
             <!--@if($document->thumbnailExists($module_info->thumbnail_width, $module_info->thumbnail_height, $module_info->thumbnail_type))-->
             <td rowspan="2" class="thumb"><a href="{getUrl('','document_srl',$document->document_srl)}" class="thumbnailMedium"><img src="{$document->getThumbnail($module_info->thumbnail_width, $module_info->thumbnail_height, $module_info->thumbnail_type)}" border="0" alt="" /></a></td>
             <td class="title">
@@ -109,7 +117,7 @@
             <!--@end-->
 
                 <!--@if($grant->is_admin)-->
-                    <input type="checkbox" value="{$document->document_srl}" onclick="doAddCart('{$mid}',this)" <!--@if($check_list[$document->document_srl])-->checked="checked"<!--@end--> /> 
+                    <input type="checkbox" name="cart" value="{$document->document_srl}" onclick="doAddDocumentCart(this)" <!--@if($document->isCarted())-->checked="checked"<!--@end--> /> 
                 <!--@end-->
                 <!--@if($module_info->use_category == "Y" && $document->get('category_srl'))-->
                 <strong>{$category_list[$document->get('category_srl')]->title}</strong>
@@ -126,23 +134,32 @@
                 <!--@end-->
                 {$document->printExtraImages(60*60*$module_info->duration_new)}
             </td>
-            <td class="author"><div class="member_{$document->get('member_srl')}">{$document->getNickName()}</div></td>
-            <td class="reading">{$document->get('readed_count')}</td>
-            <td class="recommend">{$document->get('voted_count')}</td>
-            <td class="date">{$document->getRegdate('Y-m-d')}</td>
+            <!--@if($module_info->display_author!='N')--><td class="author"><div class="member_{$document->get('member_srl')}">{$document->getNickName()}</div></td><!--@end-->
+            <!--@if($module_info->display_readed_count!='N')--><td class="reading">{$document->get('readed_count')>0?$document->get('readed_count'):'&nbsp;'}</td><!--@end-->
+            <!--@if($module_info->display_voted_count!='N')--><td class="recommend">{$document->get('voted_count')>0?$document->get('voted_count'):'&nbsp;'}</td><!--@end-->
+            <!--@if($module_info->display_regdate!='N')--><td class="date">{$document->getRegdate('Y-m-d')}</td><!--@end-->
+            <!--@if($module_info->display_last_update=='Y')--><td class="date">{zdate($document->get('last_update'),'Y-m-d H:i')}</td><!--@end-->
         </tr>
         <!--@if($document->thumbnailExists(100))-->
-          {@ $_col_count = 5}
+          {@ $_col_count = 7}
         <!--@else-->
-          {@ $_col_count = 6}
+          {@ $_col_count = 8}
         <!--@end-->
+
+        <!--@if($module_info->display_number=='N')-->{@ $_col_count --; }<!--@end-->
+        <!--@if($module_info->display_author=='N')-->{@ $_col_count --; }<!--@end-->
+        <!--@if($module_info->display_readed_count=='N')-->{@ $_col_count --; }<!--@end-->
+        <!--@if($module_info->display_voted_count=='N')-->{@ $_col_count --; }<!--@end-->
+        <!--@if($module_info->display_regdate=='N')-->{@ $_col_count --; }<!--@end-->
+        <!--@if($module_info->display_last_update=='N')-->{@ $_col_count --; }<!--@end-->
         <tr class="bg{($no+1)%2+1}">
-            <td colspan="{$_col_count}" class="summary"><a href="{getUrl('','document_srl',$document->document_srl)}">{$document->getSummary(120)}</a></td>
+            <td colspan="{$_col_count}" class="summary"><a href="{getUrl('','document_srl',$document->document_srl)}">{$document->getSummary(120)}</a>&nbsp;</td>
         </tr>
         <!--@end-->
     <!--@end-->
     </tbody>
-</table>
+    </table>
+</form>
 
 
 <div class="clear">
@@ -158,7 +175,7 @@
     <!--@if($grant->is_admin)-->
     <!-- 문서 관리 버튼 -->
     <div class="gap1 fl">
-        <a href="{getUrl('act','dispBoardAdminManageDocument')}" onclick="popopen(this.href,'manageDocument'); return false;" class="button"><span>{$lang->cmd_manage_document}</span></a>
+        <a href="{getUrl('','module','document','act','dispDocumentAdminManageDocument')}" onclick="popopen(this.href,'manageDocument'); return false;" class="button"><span>{$lang->cmd_manage_document}</span></a>
     </div>
     <!--@end-->
 
diff --git a/modules/board/skins/xe_webzine/skin.xml b/modules/board/skins/xe_webzine/skin.xml
index b93032232..222e38df0 100644
--- a/modules/board/skins/xe_webzine/skin.xml
+++ b/modules/board/skins/xe_webzine/skin.xml
@@ -140,5 +140,59 @@
             <description xml:lang="ko">썸네일의 세로 크기를 지정할 수 있습니다. (기본 100px)</description>
             <default>100</default>
         </var>
+    <var name="display_number" type="select">
+      <title xml:lang="ko">번호 표시</title>
+      <title xml:lang="jp">番号表示</title>
+      <title xml:lang="zh-CN">显示编号</title>
+      <title xml:lang="en">Dispay Number</title>
+      <default>Y</default>
+      <default>N</default>
+      <description />
+    </var>
+    <var name="display_author" type="select">
+      <title xml:lang="ko">글쓴이 표시</title>
+      <title xml:lang="jp">投稿者表示</title>
+      <title xml:lang="zh-CN">显示昵称</title>
+      <title xml:lang="en">Display Author</title>
+      <default>Y</default>
+      <default>N</default>
+      <description />
+    </var>
+    <var name="display_regdate" type="select">
+      <title xml:lang="ko">작성일 표시</title>
+      <title xml:lang="jp">作成日表示</title>
+      <title xml:lang="zh-CN">显示发表日期</title>
+      <title xml:lang="en">Display Registered Date</title>
+      <default>Y</default>
+      <default>N</default>
+      <description />
+    </var>
+    <var name="display_readed_count" type="select">
+      <title xml:lang="ko">조회수 표시</title>
+      <title xml:lang="jp">照合数表示</title>
+      <title xml:lang="zh-CN">显示查看数</title>
+      <title xml:lang="en">Display Hit</title>
+      <default>Y</default>
+      <default>N</default>
+      <description />
+    </var>
+    <var name="display_voted_count" type="select">
+      <title xml:lang="ko">추천수 표시</title>
+      <title xml:lang="jp">推薦数表示</title>
+      <title xml:lang="zh-CN">显示推荐数</title>
+      <title xml:lang="en">Display Votes</title>
+      <default>Y</default>
+      <default>N</default>
+      <description />
+    </var>
+    <var name="display_last_update" type="select">
+      <title xml:lang="ko">최근 변경시간 표시</title>
+      <title xml:lang="jp">最近の変更時間表示</title>
+      <title xml:lang="zh-CN">显示最后更新时间</title>
+      <title xml:lang="en">Display Latest Update</title>
+      <default>N</default>
+      <default>Y</default>
+      <description />
+    </var>
     </extra_vars>
 </skin>
diff --git a/modules/board/tpl/checked_list.html b/modules/board/tpl/checked_list.html
deleted file mode 100644
index e4ec76628..000000000
--- a/modules/board/tpl/checked_list.html
+++ /dev/null
@@ -1,53 +0,0 @@
-<!--%import("filter/manage_checked_document.xml")-->
-<!--%import("js/board_admin.js")-->
-
-<div id="popHeadder">
-    <h1>{$lang->cmd_manage_document}</h1>
-</div>
-
-<form action="./" method="get" id="fo_management">
-<input type="hidden" name="mid" value="{$mid}" />
-<input type="hidden" name="type" value="" />
-
-<div id="popBody">
-    <table cellspacing="0" class="tableType5">
-    <col width="150" />
-    <col />
-    <tr>
-        <th scope="row"><label for="textfield1">{$lang->checked_count}</label></th>
-        <td>{count($document_list)}</td>
-    </tr>
-    <!--@if(count($document_list) && count($board_list)>1)-->
-    <tr>
-        <th scope="row">{$lang->move_target_module}</th>
-        <td>
-          <select name="target_board" class="w100">
-          <!--@foreach($board_list as $key => $val)-->
-              <!--@if($module_srl != $val->module_srl)-->
-              <option value="{$val->module_srl}">{$val->browser_title} ({$val->mid})</option>
-              <!--@end-->
-          <!--@end-->
-          </select>
-        </td>
-    </tr>
-    <tr>
-        <th scope="row">{$lang->cmd_send_message}</th>
-        <td>
-            <textarea name="message_content" class="inputTypeTextArea w400" cols="45" rows="5"></textarea>
-        </td>
-    </tr>
-    <!--@end-->
-    </table>
-</div>
-
-<div id="popFooter">
-    <div class="tRight gap1">
-        <!--@if(count($document_list))-->
-        <a href="#" onclick="doManageDocument('move');return false;" class="button"><span>{$lang->cmd_move}</span></a>
-        <a href="#" onclick="doManageDocument('delete');return false;" class="button"><span>{$lang->cmd_delete}</span></a>
-        <!--@end-->
-        <a href="#" onclick="window.close(); return false;" class="button"><span>{$lang->cmd_close}</span></a>
-    </div>
-</div>
-
-</form>
diff --git a/modules/board/tpl/js/board_admin.js b/modules/board/tpl/js/board_admin.js
index 48c4c43a1..3251dcdb6 100644
--- a/modules/board/tpl/js/board_admin.js
+++ b/modules/board/tpl/js/board_admin.js
@@ -100,17 +100,3 @@ function doChangeCategory(fo_obj) {
     return true;
 }
 
-/* 선택된 글의 삭제 또는 이동 */
-function doManageDocument(type, mid) {
-    var fo_obj = xGetElementById("fo_management");
-    fo_obj.type.value = type;
-
-    procFilter(fo_obj, manage_checked_document);
-}
-
-/* 선택된 글의 삭제 또는 이동 후 */
-function completeManageDocument(ret_obj) {
-    if(opener) opener.location.href = opener.location.href;
-    alert(ret_obj['message']);
-    window.close();
-}
diff --git a/modules/document/conf/module.xml b/modules/document/conf/module.xml
index 32832cd11..a67a9d408 100644
--- a/modules/document/conf/module.xml
+++ b/modules/document/conf/module.xml
@@ -1,6 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <module>
     <grants />
+    <permissions>
+        <permission action="dispDocumentAdminManageDocument" target="manager" />
+        <permission action="getDocumentCategories" target="manager" />
+        <permission action="procDocumentAdminAddCart" target="manager" />
+        <permission action="procDocumentAdminManageCheckedDocument" target="manager" />
+    </permissions>
     <actions>
         <action name="dispDocumentPrint" type="view" standalone="true" />
         <action name="dispDocumentPreview" type="view" standalone="true" />
@@ -8,6 +14,13 @@
         <action name="dispDocumentAdminList" type="view" admin_index="true" standalone="true" />
         <action name="dispDocumentAdminConfig" type="view" standalone="true" />
 
+        <action name="dispDocumentAdminManageDocument" type="view" standalone="true"/>
+
+        <action name="getDocumentCategories" type="model" standalone="true"/>
+
+        <action name="procDocumentAdminAddCart" type="controller" standalone="true" />
+        <action name="procDocumentAdminManageCheckedDocument" type="controller" standalone="true" />
+
         <action name="procDocumentAdminDeleteChecked" type="controller" standalone="true" />
         <action name="procDocumentAdminInsertConfig" type="controller" standalone="true" />
         <action name="procDocumentAdminDeleteAllThumbnail" type="controller" standalone="true" />
diff --git a/modules/document/document.admin.controller.php b/modules/document/document.admin.controller.php
index b7fd9adae..853399e66 100644
--- a/modules/document/document.admin.controller.php
+++ b/modules/document/document.admin.controller.php
@@ -36,25 +36,134 @@
             $this->setMessage( sprintf(Context::getLang('msg_checked_document_is_deleted'), $document_count) );
         }
 
+        /**
+         * @brief 관리자가 글 선택시 세션에 담음
+         **/
+        function procDocumentAdminAddCart() {
+            $document_srl = Context::get('srl');
+
+            $oDocumentModel = &getModel('document');
+            $oDocument = $oDocumentModel->getDocument($document_srl);
+            if(!$oDocument->isExists()) return;
+
+            $oDocument->doCart();
+        }
+
+        /**
+         * @brief 세션에 담긴 선택글의 이동/ 삭제
+         **/
+        function procDocumentAdminManageCheckedDocument() {
+            $type = Context::get('type');
+            $module_srl = Context::get('target_module');
+            $category_srl = Context::get('target_category');
+            $message_content = Context::get('message_content');
+            if($message_content) $message_content = nl2br($message_content);
+
+            $cart = Context::get('cart');
+            if($cart) $document_srl_list = explode('|@|', $cart);
+            else $document_srl_list = array();
+
+            $document_srl_count = count($document_srl_list);
+
+            // 쪽지 발송
+            if($message_content) {
+
+                $oMemberController = &getController('member');
+                $oDocumentModel = &getModel('document');
+
+                $logged_info = Context::get('logged_info');
+
+                $title = cut_str($message_content,10,'...');
+                $sender_member_srl = $logged_info->member_srl;
+
+                for($i=0;$i<$document_srl_count;$i++) {
+                    $document_srl = $document_srl_list[$i];
+                    $oDocument = $oDocumentModel->getDocument($document_srl);
+                    if(!$oDocument->get('member_srl') || $oDocument->get('member_srl')==$sender_member_srl) continue;
+
+                    if($type=='move') $purl = sprintf("<a href=\"%s\" onclick=\"window.open(this.href);return false;\">%s</a>", $oDocument->getPermanentUrl(), $oDocument->getPermanentUrl());
+                    else $purl = "";
+                    $content .= sprintf("<div>%s</div><hr />%s<div style=\"font-weight:bold\">%s</div>%s",$message_content, $purl, $oDocument->getTitleText(), $oDocument->getContent());
+
+                    $oMemberController->sendMessage($sender_member_srl, $oDocument->get('member_srl'), $title, $content, false);
+                }
+            }
+
+            if($type == 'move') {
+                if(!$module_srl) return new Object(-1, 'fail_to_move');
+
+                $output = $this->moveDocumentModule($document_srl_list, $module_srl, $category_srl);
+                if(!$output->toBool()) return new Object(-1, 'fail_to_move');
+
+                $msg_code = 'success_moved';
+
+            } elseif($type == 'copy') {
+                if(!$module_srl) return new Object(-1, 'fail_to_move');
+
+                $output = $this->copyDocumentModule($document_srl_list, $module_srl, $category_srl);
+                if(!$output->toBool()) return new Object(-1, 'fail_to_move');
+
+                $msg_code = 'success_registed';
+
+            } elseif($type =='delete') {
+                $oDB = &DB::getInstance();
+                $oDB->begin();
+                $oDocumentController = &getController('document');
+                for($i=0;$i<$document_srl_count;$i++) {
+                    $document_srl = $document_srl_list[$i];
+                    $output = $oDocumentController->deleteDocument($document_srl, true);
+                    if(!$output->toBool()) return new Object(-1, 'fail_to_delete');
+                }
+                $oDB->commit();
+                $msg_code = 'success_deleted';
+            }
+
+            $_SESSION['document_management'] = array();
+
+            $this->setMessage($msg_code);
+        }
+
         /** 
          * @brief 특정 게시물들의 소속 모듈 변경 (게시글 이동시에 사용)
          **/
-        function moveDocumentModule($document_srl_list, $module_srl, $source_module_srl) {
+        function moveDocumentModule($document_srl_list, $module_srl, $category_srl) {
             if(!count($document_srl_list)) return;
 
-            $args->document_srls = implode(',',$document_srl_list);
-            $args->module_srl = $module_srl;
+            $oDocumentModel = &getModel('document');
+            $oDocumentController = &getController('document');
 
             $oDB = &DB::getInstance();
             $oDB->begin();
 
-            // 게시물의 이동
-            $output = executeQuery('document.updateDocumentModule', $args);
-            if(!$output->toBool()) {
-                $oDB->rollback();
-                return $output;
+            for($i=0;$i<count($document_srl_list);$i++) {
+                $document_srl = $document_srl_list[$i];
+                $oDocument = $oDocumentModel->getDocument($document_srl);
+                if(!$oDocument->isExists()) continue;
+
+                $source_category_srl = $oDocument->get('category_srl');
+
+                unset($document_args);
+                $document_args->module_srl = $module_srl;
+                $document_args->category_srl = $category_srl;
+                $document_args->document_srl = $document_srl;
+
+                // 게시물의 모듈 이동
+                $output = executeQuery('document.updateDocumentModule', $document_args);
+                if(!$output->toBool()) {
+                    $oDB->rollback();
+                    return $output;
+                }
+
+                // 카테고리가 변경되었으면 검사후 없는 카테고리면 0으로 세팅
+                if($source_category_srl != $category_srl) {
+                    if($source_category_srl) $oDocumentController->updateCategoryCount($source_category_srl);
+                    if($category_srl) $oDocumentController->updateCategoryCount($category_srl);
+                }
             }
 
+            $args->document_srls = implode(',',$document_srl_list);
+            $args->module_srl = $module_srl;
+
             // 댓글의 이동
             $output = executeQuery('comment.updateCommentModule', $args);
             if(!$output->toBool()) {
@@ -75,31 +184,53 @@
                 $oDB->rollback();
                 return $output;
             }
+            
+            $oDB->commit();
+            return new Object();
+        }
 
-            // 첨부파일의 이동 (다운로드나 본문 첨부의 문제로 인하여 첨부파일은 이동하지 않기로 결정. 차후에 다시 고민)
-            /*
-            $image_dir = sprintf('./files/attach/images/%s/%s/', $source_module_srl, $document_srl);
-            $binary_dir = sprintf('./files/attach/binaries/%s/%s/', $source_module_srl, $document_srl);
+        /** 
+         * @brief 게시글의 복사
+         **/
+        function copyDocumentModule($document_srl_list, $module_srl, $category_srl) {
+            if(!count($document_srl_list)) return;
 
-            $target_image_dir = sprintf('./files/attach/images/%s/%s/', $module_srl, $document_srl);
-            $target_binary_dir = sprintf('./files/attach/binaries/%s/%s/', $module_srl, $document_srl);
+            $oDocumentModel = &getModel('document');
+            $oDocumentController = &getController('document');
+            $oFileController = &getController('file');
 
-            if(is_dir($image_dir)) {
-                FileHandler::moveDir($image_dir, $target_image_dir);
-                if(!is_dir($target_image_dir)) {
+            $oDB = &DB::getInstance();
+            $oDB->begin();
+
+            for($i=0;$i<count($document_srl_list);$i++) {
+                $document_srl = $document_srl_list[$i];
+                $oDocument = $oDocumentModel->getDocument($document_srl);
+                if(!$oDocument->isExists()) continue;
+
+                $obj = null;
+                $obj = $oDocument->getObjectVars();
+                $obj->document_srl = getNextSequence();
+                $obj->category_srl = $category_srl;
+                $obj->password_is_hashed = true;
+
+                // 첨부파일 미리 등록
+                if($oDocument->hasUploadedFiles()) {
+                    $files = $oDocument->getUploadedFiles();
+                    foreach($files as $key => $val) {
+                        $file_info = array();
+                        $file_info['tmp_name'] = $val->uploaded_filename;
+                        $file_info['name'] = $val->source_filename;
+                        $oFileController->insertFile($file_info, $module_srl, $obj->document_srl, 0, true);
+                    }
+                }
+                
+                // 글의 등록
+                $output = $oDocumentController->insertDocument($obj, true);
+                if(!$output->toBool()) {
                     $oDB->rollback();
-                    return new Object(-1,'fail');
+                    return $output;
                 }
             }
-
-            if(is_dir($binary_dir)) {
-                FileHandler::moveDir($binary_dir, $target_binary_dir);
-                if(!is_dir($target_binary_dir)) {
-                    $oDB->rollback();
-                    return new Object(-1,'fail');
-                }
-            }
-            */
             
             $oDB->commit();
             return new Object();
@@ -292,5 +423,6 @@
             }
             $directory->close();
         }
+ 
     }
 ?>
diff --git a/modules/document/document.admin.view.php b/modules/document/document.admin.view.php
index 190168522..7d58e2321 100644
--- a/modules/document/document.admin.view.php
+++ b/modules/document/document.admin.view.php
@@ -90,5 +90,40 @@
             $this->setTemplateFile('document_config');
         }
 
+        /**
+         * @brief 관리자가 선택한 문서에 대한 관리
+         **/
+        function dispDocumentAdminManageDocument() {
+            // 선택한 목록을 세션에서 가져옴
+            $flag_list = $_SESSION['document_management'];
+            if(count($flag_list)) {
+                foreach($flag_list as $key => $val) {
+                    if(!is_bool($val)) continue;
+                    $document_srl_list[] = $key;
+                }
+
+            }
+
+            if(count($document_srl_list)) {
+                $oDocumentModel = &getModel('document');
+                $document_list = $oDocumentModel->getDocuments($document_srl_list, $this->grant->is_admin);
+                Context::set('document_list', $document_list);
+            }
+
+            // 모듈의 목록을 가져옴
+            $args->select_module = "'board','blog'";
+            $output = executeQuery('document.getAllModules', $args);
+            $module_list = $output->data;
+
+            if($module_list && !is_array($module_list)) $module_list = array($module_list);
+            Context::set('module_list', $module_list);
+
+            // 팝업 레이아웃 선택
+            $this->setLayoutPath('./common/tpl');
+            $this->setLayoutFile('popup_layout');
+
+            $this->setTemplatePath($this->module_path.'tpl');
+            $this->setTemplateFile('checked_list');
+        }
     }
 ?>
diff --git a/modules/document/document.class.php b/modules/document/document.class.php
index 13aca99ec..ee4a6e0d3 100644
--- a/modules/document/document.class.php
+++ b/modules/document/document.class.php
@@ -60,9 +60,10 @@
             if(!$oDB->isIndexExists("documents","idx_module_voted_count")) return true;
 
             /**
-             * 2007. 10. 11 : 관리자 페이지의 기본 설정 Action 추가
+             * 2007. 10. 11 : 관리자 페이지의 기본 설정 Action 추가, 게시글 관리 action 추가
              **/
             if(!$oModuleModel->getActionForward('dispDocumentAdminConfig')) return true;
+            if(!$oModuleModel->getActionForward('dispDocumentAdminManageDocument')) return true;
 
             return false;
         }
@@ -112,10 +113,12 @@
             }
 
             /**
-             * 2007. 10. 11 : 관리자 페이지의 기본 설정 Action 추가
+             * 2007. 10. 11 : 관리자 페이지의 기본 설정 Action 추가, 게시글 관리 action 추가
              **/
             if(!$oModuleModel->getActionForward('dispDocumentAdminConfig')) 
                 $oModuleController->insertActionForward('document', 'view', 'dispDocumentAdminConfig');
+            if(!$oModuleModel->getActionForward('dispDocumentAdminManageDocument')) 
+                $oModuleController->insertActionForward('document', 'view', 'dispDocumentAdminManageDocument');
 
             return new Object(0,'success_updated');
         }
diff --git a/modules/document/document.item.php b/modules/document/document.item.php
index 39c263238..e8304a02b 100644
--- a/modules/document/document.item.php
+++ b/modules/document/document.item.php
@@ -100,6 +100,23 @@
             return $this->get('notify_message')=='Y' ? true : false;
         }
 
+        function doCart() {
+            if($this->isCarted()) $this->removeCart();
+            else $this->addCart();
+        }
+
+        function addCart() {
+            $_SESSION['document_management'][$this->document_srl] = true;
+        }
+
+        function removeCart() {
+            unset($_SESSION['document_management'][$this->document_srl]);
+        }
+
+        function isCarted() {
+            return $_SESSION['document_management'][$this->document_srl];
+        }
+
         function notify($type, $content) {
             // useNotify가 아니면 return
             if(!$this->useNotify()) return;
diff --git a/modules/document/document.model.php b/modules/document/document.model.php
index 64024906e..bf97c5c9b 100644
--- a/modules/document/document.model.php
+++ b/modules/document/document.model.php
@@ -313,6 +313,21 @@
             return $output;
         }
 
+        /**
+         * @brief 특정 모듈의 분류를 구함
+         **/
+        function getDocumentCategories() {
+            $module_srl = Context::get('module_srl');
+            $categories= $this->getCategoryList($module_srl);
+            if(!$categories) return;
+
+            $output = '';
+            foreach($categories as $category_srl => $category) {
+                $output .= sprintf("%d,%s\n",$category_srl, $category->title);
+            }
+            $this->add('categories', $output);
+        }
+
         /**
          * @brief 문서 설정 정보를 구함
          **/
diff --git a/modules/document/lang/en.lang.php b/modules/document/lang/en.lang.php
index 975aff8a8..5162c806a 100644
--- a/modules/document/lang/en.lang.php
+++ b/modules/document/lang/en.lang.php
@@ -10,6 +10,7 @@
     $lang->thumbnail_crop = 'Crop';
     $lang->thumbnail_ratio = 'Ratio';
     $lang->cmd_delete_all_thumbnail = 'Delete all thumbnails';
+    $lang->move_target_module = "Target module for changing position";
 
 	$lang->cmd_toggle_checked_document = '선택항목 반전';
     $lang->cmd_delete_checked_document = 'Delete selected';
diff --git a/modules/document/lang/es.lang.php b/modules/document/lang/es.lang.php
index 3e580611d..461f01e72 100644
--- a/modules/document/lang/es.lang.php
+++ b/modules/document/lang/es.lang.php
@@ -10,6 +10,7 @@
     $lang->thumbnail_crop = 'Crop';
     $lang->thumbnail_ratio = 'Ratio';
     $lang->cmd_delete_all_thumbnail = 'Delete all thumbnails';
+    $lang->move_target_module = "Módulo para cambiar de posición";
 
 	$lang->cmd_toggle_checked_document = '선택항목 반전';
     $lang->cmd_delete_checked_document = 'Eliminar lo seleccionado';
diff --git a/modules/document/lang/jp.lang.php b/modules/document/lang/jp.lang.php
index 1c13db6f6..b57b37786 100644
--- a/modules/document/lang/jp.lang.php
+++ b/modules/document/lang/jp.lang.php
@@ -10,6 +10,7 @@
     $lang->thumbnail_crop = 'Crop';
     $lang->thumbnail_ratio = 'Ratio';
     $lang->cmd_delete_all_thumbnail = 'Delete all thumbnails';
+    $lang->move_target_module = "移動対象モジュール";
 
 	$lang->cmd_toggle_checked_document = '선택항목 반전';
     $lang->cmd_delete_checked_document = '選択項目削除';
diff --git a/modules/document/lang/ko.lang.php b/modules/document/lang/ko.lang.php
index 4c80823e7..a255efe99 100644
--- a/modules/document/lang/ko.lang.php
+++ b/modules/document/lang/ko.lang.php
@@ -19,6 +19,8 @@
     $lang->msg_is_secret = '비밀글입니다';
     $lang->msg_checked_document_is_deleted = '%d개의 글이 삭제되었습니다';
 
+    $lang->move_target_module = "이동 대상 모듈";
+
     // 관리자 페이지에서 검색할 대상
     $lang->search_target_list = array(
         'title' => '제목',
diff --git a/modules/document/lang/zh-CN.lang.php b/modules/document/lang/zh-CN.lang.php
index 98ec06f41..0dddc1374 100644
--- a/modules/document/lang/zh-CN.lang.php
+++ b/modules/document/lang/zh-CN.lang.php
@@ -10,6 +10,7 @@
     $lang->thumbnail_crop = 'Crop';
     $lang->thumbnail_ratio = 'Ratio';
     $lang->cmd_delete_all_thumbnail = 'Delete all thumbnails';
+    $lang->move_target_module = "移动目标模块";
 
     $lang->cmd_toggle_checked_document = '反选';
     $lang->cmd_delete_checked_document = '删除所选';
diff --git a/modules/document/queries/getAllModules.xml b/modules/document/queries/getAllModules.xml
new file mode 100644
index 000000000..e0a7672fe
--- /dev/null
+++ b/modules/document/queries/getAllModules.xml
@@ -0,0 +1,14 @@
+<query id="getAllModules" action="select">
+    <tables>
+        <table name="modules" />
+    </tables>
+    <columns>
+        <column name="*" />
+    </columns>
+    <conditions>
+        <condition operation="in" column="module" var="select_module" />
+    </conditions>
+    <navigation>
+        <index var="sort_index" default="mid" order="asc" />
+    </navigation>
+</query>
diff --git a/modules/document/queries/updateDocumentModule.xml b/modules/document/queries/updateDocumentModule.xml
index 5c8f08166..8c8dafd50 100644
--- a/modules/document/queries/updateDocumentModule.xml
+++ b/modules/document/queries/updateDocumentModule.xml
@@ -4,8 +4,9 @@
     </tables>
     <columns>
         <column name="module_srl" var="module_srl" filter="number" default="0" />
+        <column name="category_srl" var="category_srl" filter="number" default="0" />
     </columns>
     <conditions>
-        <condition operation="in" column="document_srl" var="document_srls" notnull="notnull" />
+        <condition operation="equal" column="document_srl" var="document_srl" notnull="notnull" />
     </conditions>
 </query>
diff --git a/modules/document/tpl/checked_list.html b/modules/document/tpl/checked_list.html
new file mode 100644
index 000000000..28547e410
--- /dev/null
+++ b/modules/document/tpl/checked_list.html
@@ -0,0 +1,74 @@
+<!--%import("filter/manage_checked_document.xml")-->
+<!--%import("js/document_admin.js")-->
+<!--%import("css/document.css")-->
+
+<div id="popHeadder">
+    <h1>{$lang->cmd_manage_document}</h1>
+</div>
+
+<form action="./" method="get" id="fo_management">
+<input type="hidden" name="type" value="" />
+
+<div id="popBody">
+    <table cellspacing="0" class="tableType5">
+    <col width="150" />
+    <col />
+    <tr>
+        <th scope="row"><label for="textfield1">{$lang->checked_count} ({count($document_list)})</label></th>
+        <td>
+            <!--@if(count($document_list))-->
+            <input type="checkbox" onclick="checkboxSelectAll(this.form, 'cart'); return false;" /> {$lang->cmd_select}
+            <ul class="document_list_box">
+                <!--@foreach($document_list as $key => $document)-->
+                <li class="document_list"><input type="checkbox" checked="checked" name="cart" value="{$document->document_srl}" onclick="doAddDocumentCart(this);"/> <address>{$document->getNickName()}</address> <span class="document_title">{$document->getTitle()}</li>
+                <!--@end-->
+            </ul>
+            <!--@else-->
+                &nbsp;
+            <!--@end-->
+        </td>
+    </tr>
+    <!--@if(count($document_list) && count($module_list)>1)-->
+    <tr>
+        <th scope="row">{$lang->move_target_module}</th>
+        <td>
+          <select id="target_module" name="target_module" class="w100" onchange="doGetCategoryFromModule(this); return false;">
+          <!--@foreach($module_list as $key => $val)-->
+              <option value="{$val->module_srl}">{$val->browser_title} ({$val->mid})</option>
+          <!--@end-->
+          </select>
+        </td>
+    </tr>
+    <tr>
+        <th scope="row">{$lang->category}</th>
+        <td>
+          <select id="target_category" name="target_category" class="w100">
+          </select>
+        </td>
+    </tr>
+    <tr>
+        <th scope="row">{$lang->cmd_send_message}</th>
+        <td>
+            <textarea name="message_content" class="inputTypeTextArea w400" cols="45" rows="5"></textarea>
+        </td>
+    </tr>
+    <!--@end-->
+    </table>
+</div>
+
+<div id="popFooter">
+    <div class="tRight gap1">
+        <!--@if(count($document_list))-->
+        <a href="#" onclick="doManageDocument('move');return false;" class="button"><span>{$lang->cmd_move}</span></a>
+        <a href="#" onclick="doManageDocument('copy');return false;" class="button"><span>{$lang->cmd_copy}</span></a>
+        <a href="#" onclick="doManageDocument('delete');return false;" class="button"><span>{$lang->cmd_delete}</span></a>
+        <!--@end-->
+        <a href="#" onclick="window.close(); return false;" class="button"><span>{$lang->cmd_close}</span></a>
+    </div>
+</div>
+
+<script type="text/javascript">
+    xAddEventListener(window,'load',function() { doGetCategoryFromModule(xGetElementById('target_module')); } );
+</script>
+
+</form>
diff --git a/modules/document/tpl/css/document.css b/modules/document/tpl/css/document.css
index 229870652..fec819620 100644
--- a/modules/document/tpl/css/document.css
+++ b/modules/document/tpl/css/document.css
@@ -1 +1,5 @@
-body { margin:10px; font-size:.75em; font-family:sans-serif;}
+.document_list_box { height:300px; overflow-y:scroll; overflow-x:hidden;}
+.document_list { margin-top:.5em; overflow:hidden; white-space:nowrap; clear:both;}
+.document_list input { float:left; margin-right:10px; }
+.document_list address { float:left; width:100px; margin-right:10px; overflow:hidden; white-space:nowrap;}
+.document_list .document_title { }
diff --git a/modules/document/tpl/filter/manage_checked_document.xml b/modules/document/tpl/filter/manage_checked_document.xml
new file mode 100644
index 000000000..0c8383093
--- /dev/null
+++ b/modules/document/tpl/filter/manage_checked_document.xml
@@ -0,0 +1,7 @@
+<filter name="manage_checked_document" module="document" act="procDocumentAdminManageCheckedDocument">
+    <form />
+    <response callback_func="completeManageDocument">
+        <tag name="error" />
+        <tag name="message" />
+    </response>
+</filter>
diff --git a/modules/document/tpl/js/document_admin.js b/modules/document/tpl/js/document_admin.js
index b336a97ca..37e472b29 100644
--- a/modules/document/tpl/js/document_admin.js
+++ b/modules/document/tpl/js/document_admin.js
@@ -19,3 +19,52 @@ function completeDeleteAllThumbnail(ret_obj) {
     alert(ret_obj['message']);
     location.reload();
 }
+
+/* 선택된 글의 삭제 또는 이동 */
+function doManageDocument(type, mid) {
+    var fo_obj = xGetElementById("fo_management");
+    fo_obj.type.value = type;
+
+    procFilter(fo_obj, manage_checked_document);
+}
+
+/* 선택된 글의 삭제 또는 이동 후 */
+function completeManageDocument(ret_obj) {
+    if(opener) opener.location.href = opener.location.href;
+    alert(ret_obj['message']);
+    window.close();
+}
+
+/* 선택된 모듈의 카테고리 목록을 가져오는 함수 */
+function doGetCategoryFromModule(obj) {
+    var module_srl = obj.options[obj.selectedIndex].value;
+
+    var params = new Array();
+    params['module_srl'] = module_srl;
+
+    var response_tags = new Array('error','message','categories');
+
+    exec_xml('document','getDocumentCategories',params, completeGetCategoryFromModules, response_tags);
+
+}
+
+function completeGetCategoryFromModules(ret_obj, response_tags) {
+    var obj = xGetElementById('target_category');
+    var length = obj.options.length;
+    for(var i=0;i<length;i++) obj.remove(0);
+
+    var categories = ret_obj['categories'];
+    if(!categories) return;
+
+    var category_list = categories.split("\n");
+    for(var i=0;i<category_list.length;i++) {
+        var item = category_list[i];
+        var pos = item.indexOf(',');
+        var category_srl = item.substr(0,pos);
+        var category_title = item.substr(pos+1,item.length);
+        if(!category_srl || !category_title) continue;
+
+        var opt = new Option(category_title, category_srl, false, false);
+        obj.options[obj.options.length] = opt;
+    }
+}

From 0f24ee06d33d680eafd098b9a9e764494e848239 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Thu, 11 Oct 2007 09:38:01 +0000
Subject: [PATCH 28/29] =?UTF-8?q?#218=20=EA=B4=80=EB=A6=AC=EC=9E=90=20?=
 =?UTF-8?q?=EB=AC=B8=EC=84=9C=20=EB=AA=A8=EB=93=88=20=EA=B4=80=EB=A6=AC=20?=
 =?UTF-8?q?=ED=8E=98=EC=9D=B4=EC=A7=80=EC=97=90=EC=84=9C=20=EA=B2=8C?=
 =?UTF-8?q?=EC=8B=9C=ED=8C=90=EA=B3=BC=20=EA=B0=99=EC=9D=B4=20=EC=84=B8?=
 =?UTF-8?q?=EC=85=98=EC=97=90=20=EC=84=A0=ED=83=9D=EB=90=9C=20=EB=AA=A9?=
 =?UTF-8?q?=EB=A1=9D=EC=9D=84=20=EC=A0=95=EB=A6=AC=ED=95=98=EA=B3=A0=20?=
 =?UTF-8?q?=EC=9D=BC=EA=B4=84=20=EC=9D=B4=EB=8F=99/=EB=B3=B5=EC=82=AC/?=
 =?UTF-8?q?=EC=82=AD=EC=A0=9C=20=EA=B0=80=20=EA=B0=80=EB=8A=A5=ED=95=98?=
 =?UTF-8?q?=EB=8F=84=EB=A1=9D=20=EC=BD=94=EB=93=9C=20=EB=B3=80=EA=B2=BD?=
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@2738 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/document/tpl/document_list.html   | 16 +++++++++++-----
 modules/document/tpl/js/document_admin.js |  4 ++--
 modules/file/file.controller.php          |  4 ++--
 3 files changed, 15 insertions(+), 9 deletions(-)

diff --git a/modules/document/tpl/document_list.html b/modules/document/tpl/document_list.html
index a04a2c7c5..4d1d8d60c 100644
--- a/modules/document/tpl/document_list.html
+++ b/modules/document/tpl/document_list.html
@@ -1,4 +1,5 @@
 <!--%import("filter/delete_checked.xml")-->
+<!--%import("filter/manage_checked_document.xml")-->
 <!--#include("header.html")-->
 
 
@@ -12,6 +13,13 @@
 
     <!-- 목록 -->
     <table cellspacing="0" class="tableType1">
+    <col width="60" />
+    <col width="20" />
+    <col />
+    <col />
+    <col width="120" />
+    <col width="60" />
+    <col width="80" />
     <thead>
         <tr>
             <th scope="col">{$lang->no}</th>
@@ -37,8 +45,8 @@
         <!--@foreach($document_list as $no => $oDocument)-->
         <tr>
             <td class="tahoma">{$no}</td>
-            <td><input type="checkbox" name="cart" value="{$oDocument->document_srl}" /></td>
-            <td class="left blue"><a href="{getUrl('','mid',$module_list[$oDocument->get('module_srl')]->mid)}" onclick="window.open(this.href);return false">{htmlspecialchars($module_list[$oDocument->get('module_srl')]->browser_title)}</a></td>
+            <td><input type="checkbox" name="cart" value="{$oDocument->document_srl}" onclick="doAddDocumentCart(this)" <!--@if($oDocument->isCarted())-->checked="checked"<!--@end-->/></td>
+            <td class="left blue category"><a href="{getUrl('','mid',$module_list[$oDocument->get('module_srl')]->mid)}" onclick="window.open(this.href);return false">{htmlspecialchars($module_list[$oDocument->get('module_srl')]->browser_title)}</a></td>
             <td class="left">
                 <a href="{getUrl('','document_srl',$oDocument->document_srl)}" onclick="window.open(this.href);return false">{$oDocument->getTitleText()}</a>
 
@@ -61,9 +69,7 @@
 
 <!-- 버튼 -->
 <div class="fr gap1">
-    <a href="javascript:checkboxSelectAll('fo_list', 'cart', true)" class="button"><span>{$lang->cmd_select_all}</span></a>
-    <a href="javascript:checkboxSelectAll('fo_list', 'cart')" class="button"><span>{$lang->cmd_reverse_all}</span></a>
-    <span class="button"><input type="submit" value="{$lang->cmd_delete_checked_document}" /></span>
+    <a href="{getUrl('','module','document','act','dispDocumentAdminManageDocument')}" onclick="popopen(this.href,'manageDocument'); return false;" class="button"><span>{$lang->cmd_manage_document}</span></a>
 </div>
 
 </form>
diff --git a/modules/document/tpl/js/document_admin.js b/modules/document/tpl/js/document_admin.js
index 37e472b29..ec123896e 100644
--- a/modules/document/tpl/js/document_admin.js
+++ b/modules/document/tpl/js/document_admin.js
@@ -21,7 +21,7 @@ function completeDeleteAllThumbnail(ret_obj) {
 }
 
 /* 선택된 글의 삭제 또는 이동 */
-function doManageDocument(type, mid) {
+function doManageDocument(type) {
     var fo_obj = xGetElementById("fo_management");
     fo_obj.type.value = type;
 
@@ -30,7 +30,7 @@ function doManageDocument(type, mid) {
 
 /* 선택된 글의 삭제 또는 이동 후 */
 function completeManageDocument(ret_obj) {
-    if(opener) opener.location.href = opener.location.href;
+    if(opener) opener.window.location.reload();
     alert(ret_obj['message']);
     window.close();
 }
diff --git a/modules/file/file.controller.php b/modules/file/file.controller.php
index c3e69055b..6c40704dd 100644
--- a/modules/file/file.controller.php
+++ b/modules/file/file.controller.php
@@ -105,7 +105,7 @@
 
             // 파일 이동
             if(!$manual_insert&&!move_uploaded_file($file_info['tmp_name'], $filename)) return false;
-            elseif($manual_insert) @rename($file_info['tmp_name'], $filename);
+            elseif($manual_insert) @copy($file_info['tmp_name'], $filename);
 
             // 사용자 정보를 구함
             $oMemberModel = &getModel('member');
@@ -119,7 +119,7 @@
             $args->source_filename = $file_info['name'];
             $args->uploaded_filename = $filename;
             $args->download_count = $download_count;
-            $args->file_size = filesize($filename);
+            $args->file_size = @filesize($filename);
             $args->comment = NULL;
             $args->member_srl = $member_srl;
             $args->sid = md5(rand(rand(1111111,4444444),rand(4444445,9999999)));

From 77646210a785640e185d6eb9aa457fc765817c19 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Thu, 11 Oct 2007 09:40:02 +0000
Subject: [PATCH 29/29] =?UTF-8?q?beta.0.2.0=20=EB=B0=B0=ED=8F=AC=EB=A5=BC?=
 =?UTF-8?q?=20=EC=9C=84=ED=95=9C=20=EB=B2=84=EC=A0=84=EB=AA=85=20=EC=88=98?=
 =?UTF-8?q?=EC=A0=95?=
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@2739 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 config/config.inc.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/config.inc.php b/config/config.inc.php
index 5b6f083ba..c5e6e79b9 100644
--- a/config/config.inc.php
+++ b/config/config.inc.php
@@ -14,7 +14,7 @@
      * 이 내용은 제로보드XE의 버전을 관리자 페이지에 표시하기 위한 용도이며
      * config.inc.php의 수정이 없더라도 공식 릴리즈시에 수정되어 함께 배포되어야 함
      **/
-    define('__ZBXE_VERSION__', '0.1.9');
+    define('__ZBXE_VERSION__', '0.2.0');
 
     /**
      * @brief 디버깅 메세지 출력