From 475bb019d5d5e8c99259f2feab5718c8072fbc9d Mon Sep 17 00:00:00 2001
From: haneul <syhan@cs.washington.edu>
Date: Mon, 15 Oct 2007 12:30:15 +0000
Subject: [PATCH 01/16] ticket:237, if colorset is null, set colorset as
 "default".

git-svn-id: http://xe-core.googlecode.com/svn/sandbox@2786 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 layouts/xe_official/layout.html | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/layouts/xe_official/layout.html b/layouts/xe_official/layout.html
index b1bbcdce6..6ede0e1f2 100644
--- a/layouts/xe_official/layout.html
+++ b/layouts/xe_official/layout.html
@@ -16,6 +16,10 @@
 </style>
 <!--@end-->
 
+<!--@if(!$layout_info->colorset)-->
+	{@$layout_info->colorset = "default"}
+<!--@end-->
+
 <div id="bodyWrap">
 	<div id="header">
 		<h1><a href="{$layout_info->index_url}"><!--@if(!$layout_info->logo_image)--><img src="./images/{$layout_info->colorset}/zeroBoardXE.png" alt="ZeroBoard™  XE" class="iePngFix" /><!--@else--><img src="{$layout_info->logo_image}" alt="logo" border="0" class="iePngFix" /><!--@end--></a></h1>

From 806975765cebaa720bf47c55ae58233ee0a9b2f7 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Tue, 16 Oct 2007 01:26:31 +0000
Subject: [PATCH 02/16] =?UTF-8?q?#238=20optimizer=20=EC=BA=90=EC=8B=9C=20?=
 =?UTF-8?q?=ED=8C=8C=EC=9D=BC=20=EC=83=9D=EC=84=B1=EC=8B=9C=20no-cache?=
 =?UTF-8?q?=EB=93=B1=EC=97=90=20=EB=8C=80=ED=95=9C=20header=EB=95=8C?=
 =?UTF-8?q?=EB=AC=B8=EC=97=90=20IE6=EC=97=90=EC=84=9C=20=EB=A1=9C=EA=B7=B8?=
 =?UTF-8?q?=EC=9D=B8/=EB=A1=9C=EA=B7=B8=EC=95=84=EC=9B=83=20=EC=95=88?=
 =?UTF-8?q?=EB=90=98=EB=8A=94=20=EB=AC=B8=EC=A0=9C=20=EB=B0=9C=EC=83=9D?=
 =?UTF-8?q?=ED=95=98=EC=98=80=EA=B3=A0=20=EC=9D=B4=20=EB=B6=80=EB=B6=84?=
 =?UTF-8?q?=EC=9D=84=20=EC=A0=9C=EA=B1=B0?=
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@2787 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 classes/optimizer/Optimizer.class.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/classes/optimizer/Optimizer.class.php b/classes/optimizer/Optimizer.class.php
index fd8d460c9..2ff8ab3ca 100644
--- a/classes/optimizer/Optimizer.class.php
+++ b/classes/optimizer/Optimizer.class.php
@@ -121,9 +121,6 @@
 header("Content-Type: {$content_type}; charset=UTF-8");
 header("Expires: Mon, 26 Jul 1997 05:00:00 GMT");
 header("Last-Modified: " . gmdate("D, d M Y H:i:s") . " GMT");
-header("Cache-Control: no-store, no-cache, must-revalidate");
-header("Cache-Control: post-check=0, pre-check=0", false);
-header("Pragma: no-cache");
 header("Content-Length: ".filesize('{$content_filename}'));
 {$gzip_header}
 if(@file_exists("{$content_filename}")) {

From 01fb4e104d3a50dcd7aec106cfa6712a64b1749c Mon Sep 17 00:00:00 2001
From: haneul <syhan@cs.washington.edu>
Date: Tue, 16 Oct 2007 01:47:41 +0000
Subject: [PATCH 03/16] =?UTF-8?q?=EB=AC=B8=EB=B2=95,=20=EC=98=A4=ED=83=80?=
 =?UTF-8?q?=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@2788 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/module/lang/en.lang.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/module/lang/en.lang.php b/modules/module/lang/en.lang.php
index f63ccf801..625d8ea67 100644
--- a/modules/module/lang/en.lang.php
+++ b/modules/module/lang/en.lang.php
@@ -52,7 +52,7 @@
     $lang->about_default = "If checked, the default will be shown when access to the site without no mid value(mid=NoValue).";
     $lang->about_module_category = "It enables you to manage it through module category.\n The URL for the module manager is <a href=\"./?module=admin&amp;act=dispModuleAdminCategory\">Manage module > Module category </a>.";
     $lang->about_description= 'It is the description only for a manager.';
-    $lang->about_default = 'If cheched, the default will be shown when access to the site without no mid value(mid=NoValue).';
+    $lang->about_default = 'If checked, this module will be shown when users access to the site without mid value (mid=NoValue).';
     $lang->about_header_text = 'The contents will be shown on the top of the module.(html tags available)';
     $lang->about_footer_text = 'The contents will be shown on the bottom of the module.(html tags available)';
     $lang->about_skin = 'You may choose a module skin.';

From 38d9ff197f2cef1f796f8de84093830174ad2e76 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Tue, 16 Oct 2007 02:03:07 +0000
Subject: [PATCH 04/16] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=9C=84?=
 =?UTF-8?q?=EC=A0=AF=EC=A4=91=20xe=5Fofficial=EC=9D=98=20=EB=A1=9C?=
 =?UTF-8?q?=EA=B7=B8=EC=9D=B8=ED=9B=84=20=EC=82=AC=EC=9A=A9=EC=9E=90?=
 =?UTF-8?q?=EC=9D=B4=EB=A6=84=EA=B3=BC=20=EB=A1=9C=EA=B7=B8=EC=95=84?=
 =?UTF-8?q?=EC=9B=83=20=EB=B2=84=ED=8A=BC=EC=9D=98=20=EA=B0=84=EA=B2=A9=20?=
 =?UTF-8?q?=EC=A1=B0=EC=A0=88?=
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@2789 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 widgets/login_info/skins/xe_official/css/black.css   | 2 +-
 widgets/login_info/skins/xe_official/css/default.css | 2 +-
 widgets/login_info/skins/xe_official/css/white.css   | 2 +-
 widgets/login_info/skins/xe_official/login_info.html | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/widgets/login_info/skins/xe_official/css/black.css b/widgets/login_info/skins/xe_official/css/black.css
index b61690c7e..c3eb0872e 100644
--- a/widgets/login_info/skins/xe_official/css/black.css
+++ b/widgets/login_info/skins/xe_official/css/black.css
@@ -18,7 +18,7 @@
 .login_black form ul.help li.first-child a { color:#cbcbcb;}
 .login_black form .userName { position:relative; width:172px; overflow:hidden; border-bottom:1px solid #515151; padding:0 0 6px 0; margin-top:-5px;}
 .login_black form .userName strong { color:#cbcbcb; padding:4px 0 0 2px; font:bold .9em Tahoma;}
-.login_black form .userName a { position:relative; top:5px; right:0px; }
+.login_black form .userName a { position:relative; right:0px; }
 .login_black form ul.userMenu { padding:0 0 6px 4px; overflow:hidden; margin-top:10px;}
 .login_black form ul.userMenu li { list-style:none; color:#cbcbcb; list-style:none;padding-left:10px; background:url(../images/black/bulletFF1A00.gif) no-repeat left 4px; height:18px; }
 .login_black form ul.userMenu li a { color:#cbcbcb;text-decoration:none;}
diff --git a/widgets/login_info/skins/xe_official/css/default.css b/widgets/login_info/skins/xe_official/css/default.css
index 02447070e..6e5493cd5 100644
--- a/widgets/login_info/skins/xe_official/css/default.css
+++ b/widgets/login_info/skins/xe_official/css/default.css
@@ -18,7 +18,7 @@
 .login_default form ul.help li a:hover { text-decoration:underline; }
 .login_default form .userName { position:relative; width:172px; overflow:hidden; border-bottom:1px solid #e4e4e4; padding:0 0 6px 0; margin-top:-5px;}
 .login_default form .userName strong { color:#282828; padding:4px 0 0 2px; font:bold .9em Tahoma;}
-.login_default form .userName a { position:relative; top:5px; right:0px; }
+.login_default form .userName a { position:relative; right:0px; }
 .login_default form ul.userMenu { padding:0 0 6px 4px; overflow:hidden; margin-top:10px;}
 .login_default form ul.userMenu li { list-style:none; padding-left:10px; background:url(../images/default/bulletFF1A00.gif) no-repeat left 4px; height:18px; }
 .login_default form ul.userMenu li a { color:#54564b; text-decoration:none;}
diff --git a/widgets/login_info/skins/xe_official/css/white.css b/widgets/login_info/skins/xe_official/css/white.css
index 656bcc66f..332b04839 100644
--- a/widgets/login_info/skins/xe_official/css/white.css
+++ b/widgets/login_info/skins/xe_official/css/white.css
@@ -18,7 +18,7 @@
 .login_white form ul.help li.first-child a { color:#54564b;}
 .login_white form .userName { position:relative; width:172px; overflow:hidden; border-bottom:1px solid #e4e4e4; padding:0 0 6px 0; margin-top:-5px;}
 .login_white form .userName strong { color:#282828; padding:4px 0 0 2px; font:bold .9em Tahoma;}
-.login_white form .userName a { position:relative; top:5px; right:0px; }
+.login_white form .userName a { position:relative; right:0px; }
 .login_white form ul.userMenu { padding:0 0 6px 4px; overflow:hidden; margin-top:10px;}
 .login_white form ul.userMenu li { list-style:none; padding-left:10px; background:url(../images/white/bulletFF1A00.gif) no-repeat left 4px; height:18px; }
 .login_white form ul.userMenu li a { color:#54564b; text-decoration:none; }
diff --git a/widgets/login_info/skins/xe_official/login_info.html b/widgets/login_info/skins/xe_official/login_info.html
index 125791d4e..2e5beb02e 100644
--- a/widgets/login_info/skins/xe_official/login_info.html
+++ b/widgets/login_info/skins/xe_official/login_info.html
@@ -14,8 +14,8 @@
 <form action="" method="post">
 
     <div class="userName">
-        <div class="fl member_{$logged_info->member_srl}"><strong>{$logged_info->nick_name}</strong></div>
-        <a href="{getUrl('act','dispMemberLogout')}"><img src="./images/{$colorset}/buttonLogout.gif" alt="{$lang->cmd_logout}" width="47" height="18" /></a>
+        <div class="fl"><div class="member_{$logged_info->member_srl}"><strong>{$logged_info->nick_name}</strong></div></div>
+        <div class="fr"><a href="{getUrl('act','dispMemberLogout')}"><img src="./images/{$colorset}/buttonLogout.gif" alt="{$lang->cmd_logout}" width="47" height="18" /></a></div>
     </div>
     <ul class="userMenu">
         <li><a href="{getUrl('act','dispMemberInfo','member_srl',$logged_info->member_srl)}">{$lang->cmd_view_member_info}</a></li>

From 786cb992ade4de80e73801f5a6f1bb3e51404f8a Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Tue, 16 Oct 2007 02:07:30 +0000
Subject: [PATCH 05/16] =?UTF-8?q?=EB=A1=9C=EA=B7=B8=EC=9D=B8=20=EC=82=AC?=
 =?UTF-8?q?=EC=9A=A9=EC=9E=90=EC=9D=98=20=EA=B2=BD=EC=9A=B0=20=EB=8B=89?=
 =?UTF-8?q?=EB=84=A4=EC=9E=84=EC=97=90=20=EC=BB=A4=EC=84=9C=EB=A5=BC=20?=
 =?UTF-8?q?=EA=B0=80=EC=A0=B8=EA=B0=80=EB=A9=B4=20=EC=86=90=EB=AA=A8?=
 =?UTF-8?q?=EC=96=91=EC=9D=98=20=EC=BB=A4=EC=84=9C=EB=A1=9C=20=ED=91=9C?=
 =?UTF-8?q?=EC=8B=9C=EB=90=98=EB=8F=84=EB=A1=9D=20cursor:pointer=20?=
 =?UTF-8?q?=EC=8A=A4=ED=83=80=EC=9D=BC=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@2790 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/member/member.controller.php | 2 +-
 modules/point/point.controller.php   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index 7520627b3..ce7c7cea0 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -1376,7 +1376,7 @@
                 $text = sprintf('<img src="%s" border="0" alt="id: %s" title="id : %s" width="%s" height="%s" align="absmiddle" style="margin-right:3px"/>%s', Context::getRequestUri().$image_mark->file, htmlspecialchars(strip_tags($matches[5])), htmlspecialchars(strip_tags($matches[5])), $image_mark->width, $image_mark->height, $text);
             }
 
-            return sprintf('<span class="nowrap member_%d">%s</span>',$member_srl, $text);
+            return sprintf('<span class="nowrap member_%d" style="cursor:pointer">%s</span>',$member_srl, $text);
         }
 
         /**
diff --git a/modules/point/point.controller.php b/modules/point/point.controller.php
index f48906500..453abfeff 100644
--- a/modules/point/point.controller.php
+++ b/modules/point/point.controller.php
@@ -82,7 +82,7 @@
 
             $title = sprintf("%s:%s%s %s, %s:%s/%s", Context::getLang('point'), $point, $this->config->point_name, $per?"(".$per."%)":"", Context::getLang('level'), $level, $this->config->max_level);
 
-            $text = sprintf('<span class="nowrap member_%s"><img src="%s" width="%s" height="%s" alt="%s" title="%s" align="absmiddle"  style="margin-right:3px"/>%s</span>', $member_srl, Context::getRequestUri().$src, $this->icon_width+2, $this->icon_height, $title, $title, $text);
+            $text = sprintf('<span class="nowrap member_%s" style="cursor:pointer"><img src="%s" width="%s" height="%s" alt="%s" title="%s" align="absmiddle"  style="margin-right:3px"/>%s</span>', $member_srl, Context::getRequestUri().$src, $this->icon_width+2, $this->icon_height, $title, $title, $text);
 
             $this->member_code[$member_srl] = $text;
 

From 0772165c63b099366b9706ca7527227f830bb6d3 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Tue, 16 Oct 2007 02:13:24 +0000
Subject: [PATCH 06/16] =?UTF-8?q?=EC=95=84=EC=9D=B4=EB=94=94/=EB=B9=84?=
 =?UTF-8?q?=EB=B0=80=EB=B2=88=ED=98=B8=20=EC=B0=BE=EA=B8=B0=20html=20?=
 =?UTF-8?q?=EC=88=98=EC=A0=95(ie6=EC=97=90=EC=84=9C=20=EC=84=A4=EB=AA=85?=
 =?UTF-8?q?=EC=9D=B4=20=EC=9A=B0=EC=B8=A1=EC=9C=BC=EB=A1=9C=20=EB=B6=99?=
 =?UTF-8?q?=EB=8D=98=20=EB=AC=B8=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@2791 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/member/skins/cozy_simple/find_member_account.html | 6 ++++--
 modules/member/skins/default/find_member_account.html     | 6 ++++--
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/modules/member/skins/cozy_simple/find_member_account.html b/modules/member/skins/cozy_simple/find_member_account.html
index 66660d061..525dd16ad 100644
--- a/modules/member/skins/cozy_simple/find_member_account.html
+++ b/modules/member/skins/cozy_simple/find_member_account.html
@@ -12,12 +12,14 @@
     <col width="140" />
     <col />
     <tr class="first-child">
-        <th scope="row"><label for="cpw">{$lang->email_address}</label></th>
+        <th rowspan="2" scope="row"><label for="cpw">{$lang->email_address}</label></th>
         <td>
             <input type="text" name="email_address" class="inputTypeText w400" />
-            <p>{$lang->about_find_member_account}</p>
         </td>
     </tr>
+    <tr>
+        <td><p>{$lang->about_find_member_account}</p></td>
+    </tr>
     </table>
 
     <div class="help tCenter">
diff --git a/modules/member/skins/default/find_member_account.html b/modules/member/skins/default/find_member_account.html
index 66660d061..525dd16ad 100644
--- a/modules/member/skins/default/find_member_account.html
+++ b/modules/member/skins/default/find_member_account.html
@@ -12,12 +12,14 @@
     <col width="140" />
     <col />
     <tr class="first-child">
-        <th scope="row"><label for="cpw">{$lang->email_address}</label></th>
+        <th rowspan="2" scope="row"><label for="cpw">{$lang->email_address}</label></th>
         <td>
             <input type="text" name="email_address" class="inputTypeText w400" />
-            <p>{$lang->about_find_member_account}</p>
         </td>
     </tr>
+    <tr>
+        <td><p>{$lang->about_find_member_account}</p></td>
+    </tr>
     </table>
 
     <div class="help tCenter">

From 78822b0df80966addff078488c61d12ca92a8103 Mon Sep 17 00:00:00 2001
From: haneul <syhan@cs.washington.edu>
Date: Tue, 16 Oct 2007 02:27:25 +0000
Subject: [PATCH 07/16] =?UTF-8?q?=EC=98=81=EB=AC=B8=EC=97=90=EC=84=9C=20la?=
 =?UTF-8?q?bel=EC=9D=B4=20checkbox=EC=97=90=20=EB=84=88=EB=AC=B4=20?=
 =?UTF-8?q?=EB=B6=99=EC=96=B4=EC=84=9C=20=EB=B3=B4=EA=B8=B0=20=EC=96=B4?=
 =?UTF-8?q?=EB=A0=A4=EC=9A=B4=20=EC=A0=90=20=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@2792 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 common/css/default.css              | 2 +-
 modules/board/tpl/board_insert.html | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/common/css/default.css b/common/css/default.css
index f9667221b..f526befd6 100644
--- a/common/css/default.css
+++ b/common/css/default.css
@@ -27,7 +27,7 @@ IE7 & IE6 & Below
 html { width:100%; }
 body { margin:0; font-size:.75em; font-family:sans-serif;}
 img { border:none; }
-label { cursor:pointer; }
+label { cursor:pointer; position:relative; left:5px; }
 form { margin:0; padding:0; }
 
 .iePngFix { behavior:url(./common/js/iePngFix.htc); } 
diff --git a/modules/board/tpl/board_insert.html b/modules/board/tpl/board_insert.html
index 9955e470c..dacab7139 100644
--- a/modules/board/tpl/board_insert.html
+++ b/modules/board/tpl/board_insert.html
@@ -75,8 +75,8 @@
     <tr>
         <th scope="row">{$lang->use_category}</th>
         <td>
-            <input type="checkbox" name="use_category" value="Y" <!--@if($module_info->use_category=='Y')-->checked="checked"<!--@end-->  class="checkbox" />
-            {$lang->about_use_category}
+            <input type="checkbox" name="use_category" value="Y" <!--@if($module_info->use_category=='Y')-->checked="checked"<!--@end-->  class="checkbox" id="fld_for_category" />
+            <label for="fld_for_category">{$lang->about_use_category}</label>
         </td>
     </tr>
     <tr>

From d95c9611b66bd0b001852974eba051b11ad0eb6a Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Tue, 16 Oct 2007 06:32:30 +0000
Subject: [PATCH 08/16] =?UTF-8?q?=EC=97=90=EB=94=94=ED=84=B0=20js=20?=
 =?UTF-8?q?=EC=8A=A4=ED=81=AC=EB=A6=BD=ED=8A=B8=EB=A5=BC=20=EA=B0=80?=
 =?UTF-8?q?=EB=B3=8D=EA=B2=8C=20=EC=88=98=EC=A0=95.=20onsubmit=EC=8B=9C?=
 =?UTF-8?q?=EC=97=90=20procFilter()=ED=95=A8=EC=88=98=EC=97=90=EC=84=9C=20?=
 =?UTF-8?q?content=20=EC=8B=B1=ED=81=AC=ED=95=98=EB=8F=84=EB=A1=9D=20?=
 =?UTF-8?q?=EB=B3=80=EA=B2=BD.=20=EA=B2=8C=EC=8B=9C=ED=8C=90/=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=A7=80/=EC=99=B8=EB=B6=80=ED=8E=98=EC=9D=B4?=
 =?UTF-8?q?=EC=A7=80/=EB=B0=A9=EB=AA=85=EB=A1=9D/=EB=B8=94=EB=A1=9C?=
 =?UTF-8?q?=EA=B7=B8=20=EA=B4=80=EB=A6=AC=EC=9E=90=20=ED=8E=98=EC=9D=B4?=
 =?UTF-8?q?=EC=A7=80=EC=9D=98=20=EB=AA=A9=EB=A1=9D=20display=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@2793 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 common/js/x.js                                |   1 +
 common/js/xml_js_filter.js                    |   7 +
 modules/admin/tpl/css/admin.css               |   1 +
 modules/blog/tpl/index.html                   |  14 +-
 modules/board/tpl/index.html                  |  16 +-
 .../editor/components/url_link/tpl/popup.js   |   2 +-
 modules/editor/tpl/js/editor.js               | 245 ++++++------------
 modules/editor/tpl/js/uploader.js             |   8 +-
 modules/guestbook/tpl/index.html              |  21 +-
 modules/opage/tpl/index.html                  |  14 +-
 modules/page/tpl/index.html                   |  14 +-
 11 files changed, 135 insertions(+), 208 deletions(-)

diff --git a/common/js/x.js b/common/js/x.js
index dc2f90356..fa6df72d3 100644
--- a/common/js/x.js
+++ b/common/js/x.js
@@ -21,6 +21,7 @@ else if(navigator.vendor!='KDE' && document.all && xUA.indexOf('msie')!=-1){
 }
 else if(document.layers){xNN4=true;}
 var xMac=xUA.indexOf('mac')!=-1;
+var xFF=xUA.indexOf('firefox')!=-1;
 
 // (element, event(without 'on'), event listener(function name)[, caption])
 function xAddEventListener(e,eT,eL,cap)
diff --git a/common/js/xml_js_filter.js b/common/js/xml_js_filter.js
index 0844dc418..bb9c3fcf9 100644
--- a/common/js/xml_js_filter.js
+++ b/common/js/xml_js_filter.js
@@ -300,6 +300,13 @@ function XmlJsFilterProc(confirm_msg) {
 
 // form proc
 function procFilter(fo_obj, filter_func) {
+    // form문 안에 위지윅 에디터가 세팅되어 있을 경우 에디터의 값과 지정된 content field를 sync
+    var editor_sequence = fo_obj.getAttribute('editor_sequence');
+    if(typeof(editor_sequence)!='undefined' && editor_sequence && typeof(editorRelKeys)!='undefined' && typeof(editorGetContent)=='function') {
+        var content = editorGetContent(editor_sequence);
+        editorRelKeys[editor_sequence]['content'].value = content;
+    }
+
     filter_func(fo_obj);
     return false;
 }
diff --git a/modules/admin/tpl/css/admin.css b/modules/admin/tpl/css/admin.css
index e884be66a..59806849b 100644
--- a/modules/admin/tpl/css/admin.css
+++ b/modules/admin/tpl/css/admin.css
@@ -87,6 +87,7 @@ select.time_zone { width:70%; position:relative; top:4px; }
 .tableType1 td a { color:#1d1d1d;}
 .tableType1 .tahoma { font-size:.9em; font-family:Tahoma;}
 .tableType1 .tahoma a { font-size:1em;}
+.tableType1 td.subject { padding:3px 0 3px 0; }
 .tableType1 td.blue a { color:#158692;}
 .tableType1 td.red a { color:#c95b53;}
 .tableType1 td.red { color:#c95b53;}
diff --git a/modules/blog/tpl/index.html b/modules/blog/tpl/index.html
index d768b1ba3..9ed080803 100644
--- a/modules/blog/tpl/index.html
+++ b/modules/blog/tpl/index.html
@@ -9,9 +9,8 @@
 
 <!-- 목록 -->
 <table cellspacing="0" class="tableType1">
-<col width="40" />
-<col width="130" />
-<col />
+<col width="50" />
+<col width="150" />
 <col />
 <col width="40" />
 <col width="80" />
@@ -38,8 +37,7 @@
                 <span class="button"><input type="submit" name="go_button" id="go_button" value="GO"  /></span>
             </form>
         </th>
-        <th scope="col">{$lang->mid}</th>
-        <th scope="col">{$lang->browser_title}</th>
+        <th scope="col">{$lang->browser_title} / {$lang->mid}</th>
         <th scope="col">{$lang->is_default}</th>
         <th scope="col">{$lang->skin}</th>
         <th scope="col">{$lang->admin_id}</th>
@@ -62,8 +60,10 @@
                 {$module_category[$val->module_category_srl]->title}
             <!--@end-->
         </td>
-        <td><div class="tLeft">&nbsp; <a href="{getUrl('act','dispBlogAdminBlogInfo','module_srl',$val->module_srl)}" class="blue">{$val->mid}</a></div></td>
-        <td><div class="tLeft nowrap">{htmlspecialchars($val->browser_title)}</div></td>
+        <td class="left subject">
+            <a href="{getUrl('act','dispBlogAdminBlogInfo','module_srl',$val->module_srl)}" class="blue">{htmlspecialchars($val->browser_title)}</a><br />
+            {$val->mid}
+        </td>
         <td class="tahoma">{$val->is_default}</td>
         <td class="tahoma">{$val->skin}</td>
         <td class="tahoma">{$val->admin_id}&nbsp;</td>
diff --git a/modules/board/tpl/index.html b/modules/board/tpl/index.html
index d8971fa97..845c978a6 100644
--- a/modules/board/tpl/index.html
+++ b/modules/board/tpl/index.html
@@ -9,9 +9,8 @@
 
 <!-- 목록 -->
 <table cellspacing="0" class="tableType1">
-<col width="40" />
-<col width="130" />
-<col />
+<col width="50" />
+<col width="150" />
 <col />
 <col width="40" />
 <col width="80" />
@@ -38,8 +37,7 @@
                 <span class="button"><input type="submit" name="go_button" id="go_button" value="GO" /></span>
             </form>
         </th>
-        <th scope="col">{$lang->mid}</th>
-        <th scope="col">{$lang->browser_title}</th>
+        <th scope="col">{$lang->browser_title} / {$lang->mid}</th>
         <th scope="col">{$lang->is_default}</th>
         <th scope="col">{$lang->skin}</th>
         <th scope="col">{$lang->admin_id}</th>
@@ -60,14 +58,16 @@
                 {$module_category[$val->module_category_srl]->title}
             <!--@end-->
         </td>
-        <td><div class="tLeft nowrap">&nbsp; <a href="{getUrl('act','dispBoardAdminBoardInfo','module_srl',$val->module_srl)}" class="blue">{$val->mid}</a></div></td>
-        <td><div class="tLeft">{htmlspecialchars($val->browser_title)}</div></td>
+        <td class="left subject">
+            <a href="{getUrl('act','dispBoardAdminBoardInfo','module_srl',$val->module_srl)}" class="blue">{htmlspecialchars($val->browser_title)}</a><br />
+            {$val->mid}
+        </td>
         <td class="tahoma">{$val->is_default}</td>
         <td class="tahoma">{$val->skin}</td>
         <td class="tahoma">{$val->admin_id}&nbsp;</td>
         <td class="tahoma">{zdate($val->regdate,"Y-m-d")}</td>
         <td class="blue"><a href="{getUrl('','mid',$val->mid)}" onclick="window.open(this.href); return false;">{$lang->cmd_view}</a></td>
-        <td class="blue"><a href="./?module=module&act=dispModuleAdminCopyModule&module_srl={$val->module_srl}" onclick="popopen(this.href);return false;">{$lang->cmd_copy}</a></td>
+        <td class="blue"><a href="./?module=module&amp;act=dispModuleAdminCopyModule&amp;module_srl={$val->module_srl}" onclick="popopen(this.href);return false;">{$lang->cmd_copy}</a></td>
         <td class="red"><!--@if($val->is_default!='Y')--><a href="{getUrl('act','dispBoardAdminDeleteBoard','module_srl', $val->module_srl)}">{$lang->cmd_delete}</a><!--@end--></td>
     </tr>
     <!--@end-->
diff --git a/modules/editor/components/url_link/tpl/popup.js b/modules/editor/components/url_link/tpl/popup.js
index 316560528..220315f3b 100644
--- a/modules/editor/components/url_link/tpl/popup.js
+++ b/modules/editor/components/url_link/tpl/popup.js
@@ -15,7 +15,7 @@ function getText() {
 
     if(node.nodeName == "A") {
         var url = node.getAttribute("HREF");
-        var text = node.text.replace(/&lt;/ig,'<').replace(/&gt;/ig,'>').replace(/&amp;/ig,'&');
+        var text = node.innerHTML.replace(/&lt;/ig,'<').replace(/&gt;/ig,'>').replace(/&amp;/ig,'&');
 
         var open_window = false;
         var bold = false;
diff --git a/modules/editor/tpl/js/editor.js b/modules/editor/tpl/js/editor.js
index 5b3a3f676..80d7c9dbc 100755
--- a/modules/editor/tpl/js/editor.js
+++ b/modules/editor/tpl/js/editor.js
@@ -2,21 +2,22 @@
  * @author zero (zero@nzeo.com)
  * @version 0.1
  * @brief 에디터 관련 스크립트
- **/
+ */
 
 /**
- * 에디터에서 사용하는 iframe, textarea의 prefix
+ * 에디터에서 사용하기 위한 변수
  **/
-var editor_mode = new Array(); ///<< 에디터의 html편집 모드 flag 세팅 변수
-var _editorSyncList = new Array(); ///< 에디터와 form 동기화를 위한 동기화 대상 목록
-var _autoSaveObj = {fo_obj:null, editor_sequence:0, title:'', content:'', locked:false} ///< 자동저장을 위한 정보를 가진 object
-var editor_rel_keys = new Array(); ///< 에디터와 각 모듈과의 연동을 위한 key 값을 보관하는 변수
+var editorMode = new Array(); ///<< 에디터의 html편집 모드 flag 세팅 변수 (html or null)
+var editorAutoSaveObj = {fo_obj:null, editor_sequence:0, title:'', content:'', locked:false} ///< 자동저장을 위한 정보를 가진 object
+var editorRelKeys = new Array(); ///< 에디터와 각 모듈과의 연동을 위한 key 값을 보관하는 변수
+var editorDragObj = {isDrag:false, y:0, obj:null, id:'', det:0, source_height:0}
 
 /**
  * 에디터 사용시 사용되는 이벤트 연결 함수 호출
  **/
-xAddEventListener(window, 'load', _editorSync); ///< 에디터의 동기화를 하는 함수를 window.load시 실행
-
+xAddEventListener(document, 'mousedown', editorDragStart);
+xAddEventListener(document, 'mouseup', editorDragStop);
+xAddEventListener(document, 'mouseup', editorEventCheck);
 
 /**
  * 에디터의 상태나 객체를 구하기 위한 함수
@@ -24,41 +25,37 @@ xAddEventListener(window, 'load', _editorSync); ///< 에디터의 동기화를 
 
 // editor_sequence값에 해당하는 iframe의 object를 return
 function editorGetIFrame(editor_sequence) {
-    var obj_id = 'editor_iframe_'+ editor_sequence;
-    return xGetElementById(obj_id);
+    return xGetElementById( 'editor_iframe_'+ editor_sequence );
 }
 
 // editor_sequence값에 해당하는 textarea object를 return
 function editorGetTextArea(editor_sequence) {
-    var obj_id = 'editor_textarea_' + editor_sequence;
-    return xGetElementById(obj_id);
+    return xGetElementById( 'editor_textarea_' + editor_sequence );
 }
 
 // editor_sequence에 해당하는 form문 구함
 function editorGetForm(editor_sequence) {
     var iframe_obj = editorGetIFrame(editor_sequence);
     if(!iframe_obj) return;
+
     var fo_obj = iframe_obj.parentNode;
     while(fo_obj.nodeName != 'FORM') { fo_obj = fo_obj.parentNode; }
     if(fo_obj.nodeName == 'FORM') return fo_obj;
     return;
 }
 
-// 에디터의 전체 내용 return, HTML 편집모드일 경우에 데이터를 이전후 값 return
+// 에디터의 전체 내용 return
 function editorGetContent(editor_sequence) {
-    var iframe_obj = editorGetIFrame(editor_sequence);
-    if(!iframe_obj) return null;
-
-    var html = null;
-    if(editor_mode[editor_sequence]=='html') {
+    var html = "";
+    if(editorMode[editor_sequence]=='html') {
         var textarea_obj = editorGetTextArea(editor_sequence);
-        var html = textarea_obj.value;
-        var contentDocument = iframe_obj.contentWindow.document;
-        contentDocument.body.innerHTML = html;
+        if(!textarea_obj) return "";
+        html = textarea_obj.value;
+    } else {
+        var iframe_obj = editorGetIFrame(editor_sequence);
+        if(!iframe_obj) return "";
+        html = xInnerHtml(iframe_obj.contentWindow.document.body).replace(/^<br([^>]*)>$/i,'');
     }
-
-    html = xInnerHtml(iframe_obj.contentWindow.document.body);
-    if(html) html = html.replace(/^<br([^>]*)>$/i,'');
     return html;
 }
 
@@ -68,7 +65,6 @@ function editorGetSelectedHtml(editor_sequence) {
     if(xIE4Up) {
         var range = iframe_obj.contentWindow.document.selection.createRange();
         var html = range.htmlText;
-        //range.select();
         return html;
     } else {
         var range = iframe_obj.contentWindow.getSelection().getRangeAt(0);
@@ -96,12 +92,9 @@ function editorGetSelectedNode(editor_sequence) {
     }
 }
 
-
 /**
  * editor 시작 (editor_sequence로 iframe객체를 얻어서 쓰기 모드로 전환)
  **/
-var editor_is_started = new Array();
-var editor_start_func = new Array();
 function editorStart(editor_sequence, primary_key, content_key, resizable, editor_height) {
     // resize 가/불가에 대한 체크
     if(typeof(resizable)=="undefined"||!resizable) resizable = false;
@@ -112,14 +105,17 @@ function editorStart(editor_sequence, primary_key, content_key, resizable, edito
     if(!iframe_obj) return;
     xWidth(iframe_obj, xWidth(iframe_obj.parentNode)-20);
 
-    // 현 에디터를 감싸고 있는 form문을 찾아서 content object를 찾아서 내용 sync
+    // 현 에디터를 감싸고 있는 form문을 찾음
     var fo_obj = editorGetForm(editor_sequence);
     if(!fo_obj) return;
 
+    // fo_obj에 editor_sequence 값 지정
+    fo_obj.setAttribute('editor_sequence', editor_sequence);
+
     // 모듈 연관 키 값을 세팅
-    editor_rel_keys[editor_sequence] = new Array();
-    editor_rel_keys[editor_sequence]["primary"] = fo_obj[primary_key];
-    editor_rel_keys[editor_sequence]["content"] = fo_obj[content_key];
+    editorRelKeys[editor_sequence] = new Array();
+    editorRelKeys[editor_sequence]["primary"] = fo_obj[primary_key];
+    editorRelKeys[editor_sequence]["content"] = fo_obj[content_key];
 
     // saved document(자동저장 문서)에 대한 확인
     if(typeof(fo_obj._saved_doc_title)!="undefined" ) { ///<< _saved_doc_title field가 없으면 자동저장 하지 않음
@@ -131,7 +127,7 @@ function editorStart(editor_sequence, primary_key, content_key, resizable, edito
             // 자동저장된 문서 활용여부를 물은 후 사용하지 않는다면 자동저장된 문서 삭제
             if(confirm(fo_obj._saved_doc_message.value)) {
                 if(typeof(fo_obj.title)!='undefined') fo_obj.title.value = saved_title;
-                editor_rel_keys[editor_sequence]['content'].value = saved_content;
+                editorRelKeys[editor_sequence]['content'].value = saved_content;
             } else {
                 editorRemoveSavedDoc();
             }
@@ -139,7 +135,7 @@ function editorStart(editor_sequence, primary_key, content_key, resizable, edito
     }
 
     // 대상 form의 content element에서 데이터를 구함
-    var content = editor_rel_keys[editor_sequence]['content'].value;
+    var content = editorRelKeys[editor_sequence]['content'].value;
 
     // IE가 아니고 내용이 없으면 <br /> 추가 (FF등에서 iframe 선택시 focus를 주기 위한 꽁수)
     if(!content && !xIE4Up) content = "<br />";
@@ -148,20 +144,26 @@ function editorStart(editor_sequence, primary_key, content_key, resizable, edito
     var contentDocument = iframe_obj.contentWindow.document;
 
     // 크기 변경 불가일 경우 드래그바 숨김
-    if(resizable == false) xGetElementById("editor_drag_bar_"+editor_sequence).style.display = "none";
-    else xGetElementById("editor_drag_bar_"+editor_sequence).style.display = "block";
-
-    // IE일 경우 ctrl-Enter 안내 문구를 노출
-    if(xIE4Up && xGetElementById('for_ie_help_'+editor_sequence)) {
-        xGetElementById('for_ie_help_'+editor_sequence).style.display = "block";
+    var dragObj = xGetElementById("editor_drag_bar_"+editor_sequence);
+    if(dragObj) {
+        if(resizable == false) dragObj.style.display = "none";
+        else dragObj.style.display = "block";
     }
 
+    // IE일 경우 ctrl-Enter 안내 문구를 노출
+    var ieHelpObj = xGetElementById("for_ie_help_"+editor_sequence);
+    if(xIE4Up && ieHelpObj) {
+        ieHelpObj.style.display = "block";
+    }
+
+    // content 생성
+    editor_path = editor_path.replace(/^\.\//ig, '');
     var contentHtml = ''+
         '<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">'+
         '<html lang="ko" xmlns="http://www.w3.org/1999/xhtml><head><meta http-equiv="content-type" content="text/html; charset=utf-8"/>'+
 		'<base href="'+request_uri+'" />'+
-        '<link rel="stylesheet" href="'+request_uri+'/common/css/default.css" type="text/css" />'+
-        '<link rel="stylesheet" href="'+request_uri+editor_path+'/css/editor.css" type="text/css" />'+
+        '<link rel="stylesheet" href="'+request_uri+'common/css/default.css" type="text/css" />'+
+        '<link rel="stylesheet" href="'+request_uri+editor_path+'css/editor.css" type="text/css" />'+
         '<style style="text/css">'+
         'body {font-size:9pt;margin:0px; height:'+editor_height+'px;}'+
         'blockquote, ol, ul { margin-left:40px; }'+
@@ -174,34 +176,15 @@ function editorStart(editor_sequence, primary_key, content_key, resizable, edito
     contentDocument.write(contentHtml);
     contentDocument.close();
 
-    // editor_mode를 기본으로 설정
-    editor_mode[editor_sequence] = null;
+    // editorMode를 기본으로 설정
+    editorMode[editor_sequence] = null;
 
-    // 에디터를 시작 시킴 (오류 발생시 에디터에 focus에 올때 에디터 시작하도록 변경)
-
-    try {
-        editorSetDesignMode(iframe_obj, contentDocument, content, fo_obj, editor_sequence);
-        editor_is_started[editor_sequence] = true;
+    // 에디터를 시작 시킴 
+    try { 
+        contentDocument.designMode = 'On';
     } catch(e) {
-        editor_start_func[editor_sequence] =  function() { editorSetDesignMode(iframe_obj, contentDocument, content, fo_obj, editor_sequence); }
-        editor_is_started[editor_sequence] = false;
-
-        // 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('실패');
     }
 
-    xAddEventListener(document,'mouseup',editorEventCheck);
-}
-
-/**
- * 에디터를 위지윅 모드로 만들기 위해 내용 작성 후 designMode 활성화
- **/
-function editorSetDesignMode(iframe_obj, contentDocument, content, fo_obj, editor_sequence ) {
-    if(editor_is_started[editor_sequence]) return;
-
-    contentDocument.designMode = 'on';
     try {
         contentDocument.execCommand("undo", false, null);
         contentDocument.execCommand("useCSS", false, true);
@@ -210,81 +193,42 @@ function editorSetDesignMode(iframe_obj, contentDocument, content, fo_obj, edito
 
     /**
      * 더블클릭이나 키눌림등의 각종 이벤트에 대해 listener 추가
+     * 작성시 필요한 이벤트 체크
+     * 이 이벤트의 경우 윈도우 sp1 (NT or xp sp1) 에서 contentDocument에 대한 권한이 없기에 try 문으로 감싸서 
+     * 에러를 무시하도록 해야 함.
      **/
-    // 작성시 필요한 이벤트 체크
-    // 이 이벤트의 경우 윈도우 sp1 (NT or xp sp1) 에서 contentDocument에 대한 권한이 없기에 try 문으로 감싸서 
-    // 에러를 무시하도록 해야 함.
     try {
+        // 에디터에서 키가 눌러질때마다 이벤트를 체크함 (enter키의 처리나 FF에서 alt-s등을 처리)
         if(xIE4Up) xAddEventListener(contentDocument, 'keydown',editorKeyPress);
         else xAddEventListener(contentDocument, 'keypress',editorKeyPress);
-        xAddEventListener(contentDocument,'mousedown',editorHideObject);
 
-        // 위젯 감시를 위한 더블클릭 이벤트 걸기 (오페라에 대한 처리는 차후에.. 뭔가 이상함)
+        // 위젯 감시를 위한 더블클릭 이벤트 걸기 
         xAddEventListener(contentDocument,'dblclick',editorSearchComponent);
     } catch(e) {
     }
 
-    xAddEventListener(document,'dblclick',editorSearchComponent);
-    xAddEventListener(document,'mousedown',editorHideObject);
-
-    /**
-     * 에디터의 내용을 지속적으로 fo_obj.content의 값과 동기화를 시킴.
-     * 차후 다른 에디터를 사용하더라도 fo_obj.content와 동기화만 된다면 어떤 에디터라도 사용 가능하도록 하기 위해
-     * 별도의 동기화 루틴을 이용함
-     **/
-    editorSyncContent(editor_rel_keys[editor_sequence]['content'], editor_sequence);
-
     // 자동저장 필드가 있다면 자동 저장 기능 활성화
     if(typeof(fo_obj._saved_doc_title)!="undefined" ) editorEnableAutoSave(fo_obj, editor_sequence);
-
-    editor_is_started[editor_sequence] = true;
 }
 
-
-
-/**
- * 에디터와 form문의 동기화를 위한 함수들
- **/
-// 여러개의 편집기를 예상하여 전역 배열 변수에 form, iframe의 정보를 넣음
-function editorSyncContent(obj, editor_sequence) {
-    _editorSyncList[_editorSyncList.length] = {field:obj, editor_sequence:editor_sequence}
-}
-
-// 편집기와 폼의 정보를 주기적으로 동기화 시킴
-function _editorSync() {
-    // 등록된 모든 에디터에 대해 동기화를 시킴
-    for(var i=0;i<_editorSyncList.length;i++) {
-        var field = _editorSyncList[i].field;
-        var editor_sequence = _editorSyncList[i].editor_sequence;
-        var content = editorGetContent(editor_sequence);
-        if(typeof(content)=='undefined') continue;
-        field.value = content;
-    }
-
-    // 1.5초마다 계속 동기화 시킴
-    setTimeout(_editorSync, 1500);
-}
-
-
-
 /**
  * 자동 저장 기능
  **/
-// 자동 저장 활성화 시키는 함수 (5초마다 자동저장)
+// 자동 저장 활성화 시키는 함수 (10초마다 자동저장)
 function editorEnableAutoSave(fo_obj, editor_sequence) {
     var title = fo_obj.title.value;
-    var content = editor_rel_keys[editor_sequence]['content'].value;
-    _autoSaveObj = {"fo_obj":fo_obj, "editor_sequence":editor_sequence, "title":title, "content":content, locked:false};
-    setTimeout(_editorAutoSave, 5000);
+    var content = editorRelKeys[editor_sequence]['content'].value;
+    editorAutoSaveObj = {"fo_obj":fo_obj, "editor_sequence":editor_sequence, "title":title, "content":content, locked:false};
+    setTimeout(_editorAutoSave, 10000);
 }
 
 // ajax를 이용하여 editor.procEditorSaveDoc 호출하여 자동 저장시킴
 function _editorAutoSave() {
-    var fo_obj = _autoSaveObj.fo_obj;
-    var editor_sequence = _autoSaveObj.editor_sequence;
+    var fo_obj = editorAutoSaveObj.fo_obj;
+    var editor_sequence = editorAutoSaveObj.editor_sequence;
 
     // 현재 자동저장중이면 중지
-    if(_autoSaveObj.locked == true) return;
+    if(editorAutoSaveObj.locked == true) return;
 
     // 대상이 없으면 자동저장 시키는 기능 자체를 중지
     if(!fo_obj || typeof(fo_obj.title)=='undefined' || !editor_sequence) return;
@@ -294,15 +238,15 @@ function _editorAutoSave() {
     var content = editorGetContent(editor_sequence);
 
     // 내용이 이전에 저장하였던 것과 다르면 자동 저장을 함
-    if(title != _autoSaveObj.title || content != _autoSaveObj.content ) {
+    if(title != editorAutoSaveObj.title || content != editorAutoSaveObj.content ) {
         var params = new Array();
 
         params["title"] = title;
         params["content"] = content;
-        params["document_srl"] = editor_rel_keys[editor_sequence]['primary'].value;
+        params["document_srl"] = editorRelKeys[editor_sequence]['primary'].value;
 
-        _autoSaveObj.title = title;
-        _autoSaveObj.content = content;
+        editorAutoSaveObj.title = title;
+        editorAutoSaveObj.content = content;
 
         var obj = xGetElementById("editor_autosaved_message_"+editor_sequence);
         var oDate = new Date();
@@ -311,11 +255,11 @@ function _editorAutoSave() {
         obj.style.display = "block";
 
         // 현재 자동저장중임을 설정
-        _autoSaveObj.locked = true;
+        editorAutoSaveObj.locked = true;
 
         // 서버 호출 (서버와 교신중이라는 메세지를 보이지 않도록 함)
         show_waiting_message = false;
-        exec_xml("editor","procEditorSaveDoc", params, function() { _autoSaveObj.locked = false; } );
+        exec_xml("editor","procEditorSaveDoc", params, function() { editorAutoSaveObj.locked = false; } );
         show_waiting_message = true;
     }
 
@@ -328,7 +272,6 @@ function editorRemoveSavedDoc() {
     exec_xml("editor","procEditorRemoveSavedDoc");
 }
 
-
 /**
  * 에디터의 세부 설정과 데이터 핸들링을 정의한 함수들
  **/
@@ -343,13 +286,6 @@ function editorFocus(editor_sequence) {
 function editorReplaceHTML(iframe_obj, html) {
     // 에디터가 활성화 되어 있는지 확인 후 비활성화시 활성화
     var editor_sequence = iframe_obj.contentWindow.document.body.getAttribute("editor_sequence");
-    if(!editor_is_started[editor_sequence]) {
-        try {
-            editor_start_func[editor_sequence];
-        } catch(e) {
-            return;
-        }
-    }
 
     // iframe 에디터에 포커스를 둠
     iframe_obj.contentWindow.focus();
@@ -398,7 +334,7 @@ function editorKeyPress(evt) {
     if(!editor_sequence) return;
 
     // IE에서 enter키를 눌렀을때 P 태그 대신 BR 태그 입력
-    if (xIE4Up && !e.ctrlKey && !e.shiftKey && e.keyCode == 13 && editor_mode[editor_sequence]!='html') {
+    if (xIE4Up && !e.ctrlKey && !e.shiftKey && e.keyCode == 13 && editorMode[editor_sequence]!='html') {
         var iframe_obj = editorGetIFrame(editor_sequence);
         if(!iframe_obj) return;
 
@@ -433,7 +369,7 @@ function editorKeyPress(evt) {
         if(!fo_obj) return;
 
         // 데이터 동기화
-        editor_rel_keys[editor_sequence]['content'].value = editorGetContent(editor_sequence);
+        editorRelKeys[editor_sequence]['content'].value = editorGetContent(editor_sequence);
 
         // form문 전송
         if(fo_obj.onsubmit) fo_obj.onsubmit();
@@ -453,7 +389,7 @@ function editorKeyPress(evt) {
         if(!iframe_obj) return;
 
         // html 에디터 모드일 경우 이벤트 취소 시킴
-        if(editor_mode[editor_sequence]=='html') {
+        if(editorMode[editor_sequence]=='html') {
             evt.cancelBubble = true;
             evt.returnValue = false;
             xPreventDefault(evt);
@@ -536,7 +472,7 @@ function editorDo(command, value, target) {
     }
 
     var editor_sequence = doc.body.getAttribute('editor_sequence');
-    if(editor_mode[editor_sequence]=='html') return;
+    if(editorMode[editor_sequence]=='html') return;
 
     // 포커스
     if(typeof(target)=="object") target.focus();
@@ -579,7 +515,6 @@ function editorChangeHeader(obj,srl) {
  **/
 
 // 에디터 상단의 컴포넌트 버튼 클릭시 action 처리 (마우스다운 이벤트 발생시마다 요청이 됨)
-var editorPrevObj = null;
 var editorPrevSrl = null;
 function editorEventCheck(evt) {
     editorPrevNode = null;
@@ -596,7 +531,7 @@ function editorEventCheck(evt) {
     var component_name = target_id.replace(/^component_([0-9]+)_/,'');
     if(!editor_sequence || !component_name) return;
 
-    if(editor_mode[editor_sequence]=='html') return;
+    if(editorMode[editor_sequence]=='html') return;
 
     switch(component_name) {
 
@@ -638,7 +573,7 @@ function editorEventCheck(evt) {
 // 컴포넌트 팝업 열기
 function openComponent(component_name, editor_sequence, manual_url) {
     editorPrevSrl = editor_sequence;
-    if(editor_mode[editor_sequence]=='html') return;
+    if(editorMode[editor_sequence]=='html') return;
 
     var popup_url = request_uri+"?module=editor&act=dispEditorPopup&editor_sequence="+editor_sequence+"&component="+component_name;
     if(typeof(manual_url)!="undefined" && manual_url) popup_url += "&manual_url="+escape(manual_url);
@@ -669,7 +604,7 @@ function editorSearchComponent(evt) {
         var widget = obj.getAttribute("widget");
         editorPrevNode = obj;
 
-        if(editor_mode[editor_sequence]=='html') return;
+        if(editorMode[editor_sequence]=='html') return;
         popopen(request_uri+"?module=widget&act=dispWidgetGenerateCodeInPage&selected_widget="+widget+"&module_srl="+editor_sequence,'GenerateCodeInPage');
         return;
     }
@@ -728,36 +663,11 @@ function editorSearchComponent(evt) {
     openComponent(editor_component, editor_sequence);
 }
 
-// 마우스 클릭시 이전 object정보를 숨김
-function editorHideObject(evt) {
-    if(!editorPrevObj) return;
-    var e = new xEvent(evt);
-    var tobj = e.target;
-    while(tobj) {
-        if(tobj.id == editorPrevObj.id) { 
-            return;
-        }
-        tobj = xParent(tobj);
-    }
-    editorPrevObj.style.visibility = 'hidden';
-    editorPrevObj = null;
-    return;
-}
-
 
 /**
  * HTML 편집 기능 활성/비활성
  **/
 function editorChangeMode(obj, editor_sequence) {
-    // 에디터가 활성화 되어 있는지 확인 후 비활성화시 활성화
-    if(!editor_is_started[editor_sequence]) {
-        try {
-            editor_start_func[editor_sequence];
-        } catch(e) {
-            return;
-        }
-    }
-
     var iframe_obj = editorGetIFrame(editor_sequence);
     if(!iframe_obj) return;
 
@@ -779,7 +689,7 @@ function editorChangeMode(obj, editor_sequence) {
         textarea_obj.style.display = "block";
         xGetElementById('xeEditorOption_'+editor_sequence).style.display = "none";
 
-        editor_mode[editor_sequence] = 'html';
+        editorMode[editor_sequence] = 'html';
 
     // 위지윅 모드 사용시
     } else {
@@ -788,7 +698,7 @@ function editorChangeMode(obj, editor_sequence) {
         iframe_obj.parentNode.style.display = "block";
         textarea_obj.style.display = "none";
         xGetElementById('xeEditorOption_'+editor_sequence).style.display = "block";
-        editor_mode[editor_sequence] = null;
+        editorMode[editor_sequence] = null;
     }
 
 }
@@ -796,9 +706,6 @@ function editorChangeMode(obj, editor_sequence) {
 /**
  * iframe 세로 크기 조절 드래그 관련
  **/
-var editorDragObj = {isDrag:false, y:0, obj:null, id:'', det:0, source_height:0}
-xAddEventListener(document, 'mousedown', editorDragStart);
-xAddEventListener(document, 'mouseup', editorDragStop);
 function editorDragStart(evt) {
     var e = new xEvent(evt);
     var obj = e.target;
diff --git a/modules/editor/tpl/js/uploader.js b/modules/editor/tpl/js/uploader.js
index bfcfedf51..2912c8477 100755
--- a/modules/editor/tpl/js/uploader.js
+++ b/modules/editor/tpl/js/uploader.js
@@ -23,7 +23,7 @@ function editor_upload_init(editor_sequence) {
 }
 
 function editor_upload_get_target_srl(editor_sequence) {
-    return editor_rel_keys[editor_sequence]["primary"].value;
+    return editorRelKeys[editor_sequence]["primary"].value;
 }
 
 function editor_upload_get_uploader_name(editor_sequence) {
@@ -185,7 +185,7 @@ function editor_display_uploaded_file(editor_sequence) {
 // 업로드된 파일 목록 비움 (단순히 select 객체의 내용을 지우고 미리보기를 제거함)
 function editor_upload_clear_list(editor_sequence, upload_target_srl) {
     if(!upload_target_srl || upload_target_srl<1) return;
-    editor_rel_keys[editor_sequence]["primary"].value = upload_target_srl;
+    editorRelKeys[editor_sequence]["primary"].value = upload_target_srl;
     
     var obj = xGetElementById('uploaded_file_list_'+editor_sequence);
     while(obj.options.length) {
@@ -264,7 +264,7 @@ function editor_remove_file(editor_sequence) {
     if(!iframe_obj) return;
 
     // upload_target_srl이 가상 번호일 경우 아무 동작 하지 않음
-    var upload_target_srl = editor_rel_keys[editor_sequence]["primary"].value;
+    var upload_target_srl = editorRelKeys[editor_sequence]["primary"].value;
     if(upload_target_srl<1) return;
 
     for(var i=0;i<obj.options.length;i++) {
@@ -287,7 +287,7 @@ function editor_remove_file(editor_sequence) {
 
 // 업로드 목록의 선택된 파일을 내용에 추가
 function editor_insert_file(editor_sequence) {
-    if(editor_mode[editor_sequence]=='html') return;
+    if(editorMode[editor_sequence]=='html') return;
     var obj = xGetElementById('uploaded_file_list_'+editor_sequence);
     if(obj.options.length<1) return;
 
diff --git a/modules/guestbook/tpl/index.html b/modules/guestbook/tpl/index.html
index 4b300767f..7e8c7824d 100644
--- a/modules/guestbook/tpl/index.html
+++ b/modules/guestbook/tpl/index.html
@@ -9,6 +9,16 @@
 
 <!-- 목록 -->
 <table cellspacing="0" class="tableType1">
+<col width="50" />
+<col width="150" />
+<col />
+<col width="40" />
+<col width="80" />
+<col width="100" />
+<col width="80" />
+<col width="40" />
+<col width="40" />
+<col width="40" />
 <thead>
     <tr>
         <th scope="col">{$lang->no}</th>
@@ -16,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">
+                <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>
@@ -27,8 +37,7 @@
                 <span class="button"><input type="submit" name="go_button" id="go_button" value="GO" /></span>
             </form>
         </th>
-        <th scope="col">{$lang->mid}</th>
-        <th scope="col">{$lang->browser_title}</th>
+        <th scope="col">{$lang->browser_title} / {$lang->mid}</th>
         <th scope="col">{$lang->is_default}</th>
         <th scope="col">{$lang->skin}</th>
         <th scope="col">{$lang->admin_id}</th>
@@ -48,8 +57,10 @@
                 {$module_category[$val->module_category_srl]->title}
             <!--@end-->
         </td>
-        <td><a href="{getUrl('act','dispGuestbookAdminGuestbookInfo','module_srl',$val->module_srl)}" class="blue">{$val->mid}</a></td>
-        <td>{htmlspecialchars($val->browser_title)}</td>
+        <td class="left subject">
+            <a href="{getUrl('act','dispGuestbookAdminGuestbookInfo','module_srl',$val->module_srl)}" class="blue">{htmlspecialchars($val->browser_title)}</a><br />
+            {$val->mid}
+        </td>
         <td class="tahoma">{$val->is_default}</td>
         <td class="tahoma">{$val->skin}</td>
         <td class="tahoma">{$val->admin_id}</td>
diff --git a/modules/opage/tpl/index.html b/modules/opage/tpl/index.html
index 21074c2fc..f2a0f10b1 100644
--- a/modules/opage/tpl/index.html
+++ b/modules/opage/tpl/index.html
@@ -10,9 +10,8 @@
 
 <!-- 목록 -->
 <table cellspacing="0" class="tableType1">
-<col width="40" />
-<col width="140" />
-<col />
+<col width="50" />
+<col width="150" />
 <col />
 <col width="40" />
 <col width="80" />
@@ -37,8 +36,7 @@
                 <span class="button"><input type="submit" name="go_button" id="go_button" value="GO" /></span>
             </form>
         </th>
-        <th scope="col">{$lang->mid}</th>
-        <th scope="col">{$lang->browser_title}</th>
+        <th scope="col">{$lang->browser_title} / {$lang->mid}</th>
         <th scope="col">{$lang->is_default}</th>
         <th scope="col">{$lang->regdate}</th>
         <th scope="col">{$lang->cmd_view}</th>
@@ -58,8 +56,10 @@
                 {$module_category[$val->module_category_srl]->title}
             <!--@end-->
         </td>
-        <td><a href="{getUrl('act','dispOpageAdminInsert','module_srl',$val->module_srl)}" class="blue">{$val->mid}</a></td>
-        <td>{$val->browser_title}</td>
+        <td class="left subject">
+            <a href="{getUrl('act','dispOpageAdminInsert','module_srl',$val->module_srl)}" class="blue">{htmlspecialchars($val->browser_title)}</a><br />
+            {$val->mid}
+        </td>
         <td class="tahoma">{$val->is_default}</td>
         <td class="tahoma">{zdate($val->regdate,"Y-m-d")}</td>
         <td class="blue"><a href="{getUrl('','mid',$val->mid)}"  onclick="window.open(this.href); return false;">{$lang->cmd_view}</a></td>
diff --git a/modules/page/tpl/index.html b/modules/page/tpl/index.html
index 566778b7b..379cc164b 100644
--- a/modules/page/tpl/index.html
+++ b/modules/page/tpl/index.html
@@ -10,9 +10,8 @@
 
 <!-- 목록 -->
 <table cellspacing="0" class="tableType1">
-<col width="40" />
-<col width="140" />
-<col />
+<col width="50" />
+<col width="150" />
 <col />
 <col width="40" />
 <col width="80" />
@@ -37,8 +36,7 @@
                 <span class="button"><input type="submit" name="go_button" id="go_button" value="GO" /></span>
             </form>
         </th>
-        <th scope="col">{$lang->mid}</th>
-        <th scope="col">{$lang->browser_title}</th>
+        <th scope="col">{$lang->browser_title} / {$lang->mid}</th>
         <th scope="col">{$lang->is_default}</th>
         <th scope="col">{$lang->regdate}</th>
         <th scope="col">{$lang->cmd_view}</th>
@@ -58,8 +56,10 @@
                 {$module_category[$val->module_category_srl]->title}
             <!--@end-->
         </td>
-        <td><div class="tLeft nowrap">&nbsp; <a href="{getUrl('act','dispPageAdminInfo','module_srl',$val->module_srl)}" class="blue">{$val->mid}</a></div></td>
-        <td><div class="tLeft">{$val->browser_title}</div></td>
+        <td class="left subject">
+            <a href="{getUrl('act','dispPageAdminInfo','module_srl',$val->module_srl)}" class="blue">{htmlspecialchars($val->browser_title)}</a><br />
+            {$val->mid}
+        </td>
         <td class="tahoma">{$val->is_default}</td>
         <td class="tahoma">{zdate($val->regdate,"Y-m-d")}</td>
         <td class="blue"><a href="{getUrl('','mid',$val->mid)}"  onclick="window.open(this.href); return false;">{$lang->cmd_view}</a></td>

From 6f55ee94292f43d415d1ddca4f23306bd3965a8f Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Tue, 16 Oct 2007 06:42:46 +0000
Subject: [PATCH 09/16] =?UTF-8?q?=EC=B2=A8=EB=B6=80=ED=8C=8C=EC=9D=BC/?=
 =?UTF-8?q?=EB=AC=B8=EC=84=9C=20=EA=B4=80=EB=A6=AC=EC=9E=90=20=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=A7=80=EC=9D=98=20=EB=AA=A9=EB=A1=9D=20=ED=8E=98?=
 =?UTF-8?q?=EC=9D=B4=EC=A7=80=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@2794 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/admin/tpl/css/admin.css         |  2 +-
 modules/document/tpl/document_list.html |  6 ++----
 modules/file/tpl/file_list.html         | 16 +++++++++++++---
 3 files changed, 16 insertions(+), 8 deletions(-)

diff --git a/modules/admin/tpl/css/admin.css b/modules/admin/tpl/css/admin.css
index 59806849b..05c807832 100644
--- a/modules/admin/tpl/css/admin.css
+++ b/modules/admin/tpl/css/admin.css
@@ -87,7 +87,7 @@ select.time_zone { width:70%; position:relative; top:4px; }
 .tableType1 td a { color:#1d1d1d;}
 .tableType1 .tahoma { font-size:.9em; font-family:Tahoma;}
 .tableType1 .tahoma a { font-size:1em;}
-.tableType1 td.subject { padding:3px 0 3px 0; }
+.tableType1 td.subject { padding:3px 0 3px 0; line-height:140%;}
 .tableType1 td.blue a { color:#158692;}
 .tableType1 td.red a { color:#c95b53;}
 .tableType1 td.red { color:#c95b53;}
diff --git a/modules/document/tpl/document_list.html b/modules/document/tpl/document_list.html
index 4d1d8d60c..d5dfd9bfd 100644
--- a/modules/document/tpl/document_list.html
+++ b/modules/document/tpl/document_list.html
@@ -16,7 +16,6 @@
     <col width="60" />
     <col width="20" />
     <col />
-    <col />
     <col width="120" />
     <col width="60" />
     <col width="80" />
@@ -34,7 +33,6 @@
                     </select><a href="#" onclick="location.href=current_url.setQuery('module_srl',xGetElementById('module_srl').options[xGetElementById('module_srl').selectedIndex].value);return false;" class="button"><span>GO</span></a>
                 </div>
             </th>
-            <th scope="col">{$lang->title}</th>
             <th scope="col">{$lang->user_name}</th>
             <th scope="col">{$lang->readed_count}</th>
             <th scope="col">{$lang->voted_count}</th>
@@ -46,8 +44,8 @@
         <tr>
             <td class="tahoma">{$no}</td>
             <td><input type="checkbox" name="cart" value="{$oDocument->document_srl}" onclick="doAddDocumentCart(this)" <!--@if($oDocument->isCarted())-->checked="checked"<!--@end-->/></td>
-            <td class="left 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">
+            <td class="left subject">
+                <a href="{getUrl('','mid',$module_list[$oDocument->get('module_srl')]->mid)}" class="blue" onclick="window.open(this.href);return false">[{htmlspecialchars($module_list[$oDocument->get('module_srl')]->browser_title)}]</a><br />
                 <a href="{getUrl('','document_srl',$oDocument->document_srl)}" onclick="window.open(this.href);return false">{$oDocument->getTitleText()}</a>
 
                 <!--@if($oDocument->getCommentCount())-->
diff --git a/modules/file/tpl/file_list.html b/modules/file/tpl/file_list.html
index 9c2e539a0..123aeec07 100644
--- a/modules/file/tpl/file_list.html
+++ b/modules/file/tpl/file_list.html
@@ -11,6 +11,15 @@
 
 <!-- 목록 -->
 <table cellspacing="0" class="tableType1">
+<col width="60" />
+<col width="30" />
+<col />
+<col width="80" />
+<col width="60" />
+<col width="100" />
+<col width="80" />
+<col width="100" />
+<col width="70" />
 <thead>
     <tr>
         <th scope="col">{$lang->no}</th>
@@ -25,7 +34,6 @@
                 </select><a href="#" onclick="location.href=current_url.setQuery('module_srl',xGetElementById('module_srl').options[xGetElementById('module_srl').selectedIndex].value);return false;" class="button"><span>GO</span></a>
             </div>
         </th>
-        <th scope="col">{$lang->file_name}</th>
         <th scope="col">{$lang->file_size}</th>
         <th scope="col">{$lang->is_valid}</th>
         <th scope="col">{$lang->download_count}</th>
@@ -39,8 +47,10 @@
     <tr>
         <td class="tahoma">{$no}</td>
         <td><input type="checkbox" name="cart" value="{$val->file_srl}" /></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="left subject">
+            <a href="./?mid={$module_list[$val->module_srl]->mid}" onclick="window.open(this.href);return false;" class="blue">{$module_list[$val->module_srl]->browser_title}</a><br />
+            <a href="{$val->download_url}" class="red">{htmlspecialchars($val->source_filename)}</a>
+        </td>
         <td class="tahoma">{$val->file_size}</td>
         <td>
             <!--@if($val->isvalid=='Y')-->

From c5b7cf6e70fa80a7342a32a2811b084d1559599f Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Tue, 16 Oct 2007 06:46:06 +0000
Subject: [PATCH 10/16] =?UTF-8?q?=ED=8F=AC=EC=9D=B8=ED=8A=B8=20=EB=AA=A8?=
 =?UTF-8?q?=EB=93=88=EC=9D=98=20=ED=9A=8C=EC=9B=90=EA=B0=80=EC=9E=85?=
 =?UTF-8?q?=ED=95=AD=EB=AA=A9=EC=9D=84=20=EC=88=98=EC=A0=95=EC=8B=9C?=
 =?UTF-8?q?=EC=97=90=20=EB=AA=A8=EB=93=88=20=EC=97=85=EB=8D=B0=EC=9D=B4?=
 =?UTF-8?q?=ED=8A=B8=20=EC=95=8C=EB=9E=8C=EC=9D=B4=20=EB=9C=A8=EB=8D=98=20?=
 =?UTF-8?q?=EB=AC=B8=EC=A0=9C=20=ED=95=B4=EA=B2=B0?=
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@2795 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/point/point.class.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/point/point.class.php b/modules/point/point.class.php
index e09766a9c..cd315b3c6 100644
--- a/modules/point/point.class.php
+++ b/modules/point/point.class.php
@@ -88,7 +88,7 @@
             $oModuleModel = &getModel('module');
             $config = $oModuleModel->getModuleConfig('point');
 
-            if(!$config->signup || !$config->signup_act) return true;
+            if(!isset($config->signup) || !isset($config->signup_act)) return true;
 
             return false;
         }

From 8ea5dd44c1b4b24316dab60304e255ce08720b17 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Tue, 16 Oct 2007 06:48:00 +0000
Subject: [PATCH 11/16] =?UTF-8?q?=ED=86=B5=ED=95=A9=EA=B2=80=EC=83=89=20?=
 =?UTF-8?q?=EB=AA=A8=EB=93=88=EC=9D=98=20</form>=20=EB=AC=B8=EC=9D=B4=20?=
 =?UTF-8?q?=EC=97=86=EB=8A=94=20=EC=83=98=ED=94=8C=20=EC=BD=94=EB=93=9C=20?=
 =?UTF-8?q?=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@2796 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/integration_search/integration_search.admin.view.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/modules/integration_search/integration_search.admin.view.php b/modules/integration_search/integration_search.admin.view.php
index 29d284de8..1ecb12020 100644
--- a/modules/integration_search/integration_search.admin.view.php
+++ b/modules/integration_search/integration_search.admin.view.php
@@ -39,7 +39,7 @@
             Context::set('mid_list',$mid_list);
 
             // 샘플코드
-            Context::set('sample_code', htmlspecialchars('<form action="{getUrl()}" method="get"><input type="hidden" name="mid" value="{$mid}" /><input type="hidden" name="act" value="IS" /><input type="text" name="is_keyword" class="inputTypeText" value="{$is_keyword}" /><span class="button"><input type="submit" value="{$lang->cmd_search}" /></span></a>') );
+            Context::set('sample_code', htmlspecialchars('<form action="{getUrl()}" method="get"><input type="hidden" name="mid" value="{$mid}" /><input type="hidden" name="act" value="IS" /><input type="text" name="is_keyword" class="inputTypeText" value="{$is_keyword}" /><span class="button"><input type="submit" value="{$lang->cmd_search}" /></span></form>') );
 
             $this->setTemplateFile("index");
         }

From 9144e3a0c2042361d1e51af17b4fd67e862712ea Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Tue, 16 Oct 2007 06:52:01 +0000
Subject: [PATCH 12/16] =?UTF-8?q?scroll=EC=9D=B4=20=EC=A1=B0=EA=B8=88?=
 =?UTF-8?q?=EC=9D=B4=EB=9D=BC=EB=8F=84=20=EB=90=98=EC=96=B4=20=EC=9E=88?=
 =?UTF-8?q?=EC=9C=BC=EB=A9=B4=20=EB=A1=9C=EA=B7=B8=EC=9D=B8=ED=8F=BC?=
 =?UTF-8?q?=EC=9D=98=20=EC=82=AC=EC=9A=A9=EC=9E=90=20=EC=95=84=EC=9D=B4?=
 =?UTF-8?q?=EB=94=94=EC=97=90=20=ED=8F=AC=EC=BB=A4=EC=8A=A4=EA=B0=80=20?=
 =?UTF-8?q?=EA=B0=80=EC=A7=80=20=EC=95=8A=EB=8F=84=EB=A1=9D=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@2797 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 widgets/login_info/skins/xe_official/js/login.js | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/widgets/login_info/skins/xe_official/js/login.js b/widgets/login_info/skins/xe_official/js/login.js
index c864ddc5d..fd6e8c24c 100644
--- a/widgets/login_info/skins/xe_official/js/login.js
+++ b/widgets/login_info/skins/xe_official/js/login.js
@@ -4,14 +4,12 @@ function doFocusUserId(fo_id) {
     if(xGetCookie('user_id')) {
         fo_obj.user_id.value = xGetCookie('user_id');
         fo_obj.remember_user_id.checked = true;
-        try{
-            fo_obj.password.focus();
-        } catch(e) {};
-    } else {
-        try{
-            fo_obj.user_id.focus();
-        } catch(e) {};
     }
+
+    try {
+        if(xScrollTop()) return;
+        fo_obj.user_id.focus();
+    } catch(e) { }
 }
 
 /* 로그인 후 */

From 64a0462b07f1976e101ad5fb9173e82cccbfa29c Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Tue, 16 Oct 2007 07:24:40 +0000
Subject: [PATCH 13/16] =?UTF-8?q?=EC=B5=9C=EA=B7=BC=20=EA=B2=8C=EC=8B=9C?=
 =?UTF-8?q?=EB=AC=BC=20=EC=9C=84=EC=A0=AF=EC=9D=98=20xe=5Fofficial=20?=
 =?UTF-8?q?=EC=8A=A4=ED=82=A8=EC=9D=98=20css=EB=B0=8F=20html=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@2798 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 widgets/newest_document/skins/xe_official/css/black.css | 6 ++----
 widgets/newest_document/skins/xe_official/css/white.css | 6 ++----
 widgets/newest_document/skins/xe_official/list.html     | 2 +-
 3 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/widgets/newest_document/skins/xe_official/css/black.css b/widgets/newest_document/skins/xe_official/css/black.css
index 7a21fa5da..48e773b17 100644
--- a/widgets/newest_document/skins/xe_official/css/black.css
+++ b/widgets/newest_document/skins/xe_official/css/black.css
@@ -2,16 +2,14 @@
 .latest_black h2 { display:block; height:21px; padding:9px 0 0 9px; margin-bottom:12px; color:#ffffff; background:url(../images/black/lineNotice.gif) no-repeat left bottom; font-size:1em;}
 
 .latest_black ul { }
-.latest_black ul li { position:relative; height:21px; background:url(../images/black/bulletD0.gif) no-repeat left 5px; padding-left:10px; overflow:hidden; }
+.latest_black ul li { height:18px; background:url(../images/black/bulletD0.gif) no-repeat left 5px; padding-left:10px; overflow:hidden; list-style:none; white-space:nowrap;}
 
-.latest_black ul li .title { position:relative; z-index:0; overflow:hidden; width:100%; white-space:nowrap;}
 .latest_black ul li .title a { color:#818181; text-decoration:none; }
 .latest_black ul li .title a:hover { text-decoration:underline; }
 .latest_black ul li .title span.comment { color:#FE6700; font:.8em Tahoma; }
 .latest_black ul li .title span.comment a { color:#FE6700; font:.8em Tahoma; }
 
-.latest_black ul li .date { position:relative; z-index:1; }
-.latest_black ul li .date span { background:#FFFFFF; position:relative; z-index:1; padding:3px 5px 3px 12px; text-align:right; float:right; top:-16px; _top:-18px; color:#999999; font:.8em Tahoma; }
+.latest_black ul li .date { color:#999999; font:.8em Tahoma; white-space:nowrap; margin-right:5px;}
 
 .latest_black .more { position:absolute; top:12px; right:11px; color:#54564b; font:.8em Tahoma;}
 .latest_black a.more { text-decoration:none;} 
diff --git a/widgets/newest_document/skins/xe_official/css/white.css b/widgets/newest_document/skins/xe_official/css/white.css
index 1469a3265..2bb442ec8 100644
--- a/widgets/newest_document/skins/xe_official/css/white.css
+++ b/widgets/newest_document/skins/xe_official/css/white.css
@@ -2,16 +2,14 @@
 .latest_white h2 { display:block; height:21px; padding:9px 0 0 9px; margin-bottom:12px; color:#000000; background:url(../images/white/lineNotice.gif) no-repeat left bottom; font-size:1em;}
 
 .latest_white ul { }
-.latest_white ul li { position:relative; height:21px; background:url(../images/white/bulletD0.gif) no-repeat left 5px; padding-left:10px; overflow:hidden; }
+.latest_white ul li { height:18px; background:url(../images/white/bulletD0.gif) no-repeat left 5px; padding-left:10px; overflow:hidden; list-style:none; white-space:nowrap;}
 
-.latest_white ul li .title { position:relative; z-index:0; overflow:hidden; width:100%; white-space:nowrap;}
 .latest_white ul li .title a { color:#555555; text-decoration:none; }
 .latest_white ul li .title a:hover { text-decoration:underline; }
 .latest_white ul li .title span.comment { color:#FE6700; font:.8em Tahoma; }
 .latest_white ul li .title span.comment a { color:#FE6700; font:.8em Tahoma; }
 
-.latest_white ul li .date { position:relative; z-index:1; }
-.latest_white ul li .date span { background:#FFFFFF; position:relative; z-index:1; padding:3px 5px 3px 12px; text-align:right; float:right; top:-16px; _top:-18px; color:#999999; font:.8em Tahoma; }
+.latest_white ul li .date { color:#999999; font:.8em Tahoma; white-space:nowrap; margin-right:5px;}
 
 .latest_white .more { position:absolute; top:12px; right:11px; color:#54564b; font:.8em Tahoma;}
 .latest_white a.more { text-decoration:none;} 
diff --git a/widgets/newest_document/skins/xe_official/list.html b/widgets/newest_document/skins/xe_official/list.html
index 6c90c9c2c..66052215a 100644
--- a/widgets/newest_document/skins/xe_official/list.html
+++ b/widgets/newest_document/skins/xe_official/list.html
@@ -13,6 +13,7 @@
     <ul>
         <!--@foreach($widget_info->document_list as $oDocument)-->
         <li>
+          <span class="date">{$oDocument->getRegdate("Y-m-d")}</span>
           <span class="title">
             <a href="{$oDocument->getPermanentUrl()}#{$oDocument->getCommentCount()}">{$oDocument->getTitleText($widget_info->subject_cut_size)}</a>
             <!--@if($oDocument->getCommentCount())-->
@@ -21,7 +22,6 @@
 
             {$oDocument->printExtraImages($widget_info->duration_new)}
           </span>
-          <span class="date"><span>{$oDocument->getRegdate("Y-m-d")}</span></span>
         </li>
         <!--@end-->
     </ul>

From 471dd801665d8ebe4914796b3c5174792073ccc6 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Tue, 16 Oct 2007 07:30:09 +0000
Subject: [PATCH 14/16] =?UTF-8?q?xe=5Fofficial=20=EC=B5=9C=EA=B7=BC=20?=
 =?UTF-8?q?=EA=B2=8C=EC=8B=9C=EB=AC=BC=20=EC=9C=84=EC=A0=AF=EC=9D=98=20?=
 =?UTF-8?q?=EA=B0=84=EA=B2=A9=EC=9D=84=20=EC=A1=B0=EA=B8=88=20=EB=84=93?=
 =?UTF-8?q?=ED=9E=98?=
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@2799 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 widgets/newest_document/skins/xe_official/css/black.css | 2 +-
 widgets/newest_document/skins/xe_official/css/white.css | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/widgets/newest_document/skins/xe_official/css/black.css b/widgets/newest_document/skins/xe_official/css/black.css
index 48e773b17..a14fc63d5 100644
--- a/widgets/newest_document/skins/xe_official/css/black.css
+++ b/widgets/newest_document/skins/xe_official/css/black.css
@@ -2,7 +2,7 @@
 .latest_black h2 { display:block; height:21px; padding:9px 0 0 9px; margin-bottom:12px; color:#ffffff; background:url(../images/black/lineNotice.gif) no-repeat left bottom; font-size:1em;}
 
 .latest_black ul { }
-.latest_black ul li { height:18px; background:url(../images/black/bulletD0.gif) no-repeat left 5px; padding-left:10px; overflow:hidden; list-style:none; white-space:nowrap;}
+.latest_black ul li { height:20px; background:url(../images/black/bulletD0.gif) no-repeat left 5px; padding-left:10px; overflow:hidden; list-style:none; white-space:nowrap;}
 
 .latest_black ul li .title a { color:#818181; text-decoration:none; }
 .latest_black ul li .title a:hover { text-decoration:underline; }
diff --git a/widgets/newest_document/skins/xe_official/css/white.css b/widgets/newest_document/skins/xe_official/css/white.css
index 2bb442ec8..dbf002a4c 100644
--- a/widgets/newest_document/skins/xe_official/css/white.css
+++ b/widgets/newest_document/skins/xe_official/css/white.css
@@ -2,7 +2,7 @@
 .latest_white h2 { display:block; height:21px; padding:9px 0 0 9px; margin-bottom:12px; color:#000000; background:url(../images/white/lineNotice.gif) no-repeat left bottom; font-size:1em;}
 
 .latest_white ul { }
-.latest_white ul li { height:18px; background:url(../images/white/bulletD0.gif) no-repeat left 5px; padding-left:10px; overflow:hidden; list-style:none; white-space:nowrap;}
+.latest_white ul li { height:20px; background:url(../images/white/bulletD0.gif) no-repeat left 5px; padding-left:10px; overflow:hidden; list-style:none; white-space:nowrap;}
 
 .latest_white ul li .title a { color:#555555; text-decoration:none; }
 .latest_white ul li .title a:hover { text-decoration:underline; }

From de0101e4532ca9345f757a575080b9a58d8d0087 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Tue, 16 Oct 2007 07:34:56 +0000
Subject: [PATCH 15/16] =?UTF-8?q?beta.0.2.3=20=EC=9C=BC=EB=A1=9C=20?=
 =?UTF-8?q?=EB=B2=84=EC=A0=84=20=EC=97=85=EA=B7=B8=EB=A0=88=EC=9D=B4?=
 =?UTF-8?q?=EB=93=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@2800 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 02abfd2b7..9ec50bf5f 100644
--- a/config/config.inc.php
+++ b/config/config.inc.php
@@ -14,7 +14,7 @@
      * 이 내용은 제로보드XE의 버전을 관리자 페이지에 표시하기 위한 용도이며
      * config.inc.php의 수정이 없더라도 공식 릴리즈시에 수정되어 함께 배포되어야 함
      **/
-    define('__ZBXE_VERSION__', '0.2.2');
+    define('__ZBXE_VERSION__', '0.2.3');
 
     /**
      * @brief 디버깅 메세지 출력

From f9896fe51a64d2911f50fb94d52e625e19a107c8 Mon Sep 17 00:00:00 2001
From: zero <skklove@gmail.com>
Date: Tue, 16 Oct 2007 08:15:05 +0000
Subject: [PATCH 16/16] =?UTF-8?q?=EC=AA=BD=EC=A7=80=20=EB=B0=9C=EC=86=A1?=
 =?UTF-8?q?=EC=8B=9C=20=EB=A9=94=EC=9D=BC=EB=A1=9C=EB=8F=84=20=EB=B0=9C?=
 =?UTF-8?q?=EC=86=A1=ED=95=A0=20=EA=B2=83=EC=9D=B8=EC=A7=80=EC=97=90=20?=
 =?UTF-8?q?=EB=8C=80=ED=95=9C=20=EC=98=B5=EC=85=98=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@2801 201d5d3c-b55e-5fd7-737f-ddc643e51545
---
 modules/member/member.controller.php               | 7 ++++++-
 modules/member/skins/cozy_simple/send_message.html | 4 ++++
 modules/member/skins/default/send_message.html     | 4 ++++
 3 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/modules/member/member.controller.php b/modules/member/member.controller.php
index ce7c7cea0..d20b83349 100644
--- a/modules/member/member.controller.php
+++ b/modules/member/member.controller.php
@@ -146,6 +146,9 @@
             $content = trim(Context::get('content'));
             if(!$content) return new Object(-1, 'msg_content_is_null');
 
+            $send_mail = Context::get('send_mail');
+            if($send_mail != 'Y') $send_mail = 'N';
+
             // 받을 회원이 있는지에 대한 검사
             $oMemberModel = &getModel('member');
             $receiver_member_info = $oMemberModel->getMemberInfoByMemberSrl($receiver_srl);
@@ -162,7 +165,9 @@
             $output = $this->sendMessage($logged_info->member_srl, $receiver_srl, $title, $content);
 
             // 메일로도 발송
-            if($output->toBool()) {
+            if($output->toBool() && $send_mail == 'Y') {
+                $view_url = Context::getRequestUri();
+                $content = sprintf("%s<br /><br />From : <a href=\"%s\" target=\"_blank\">%s</a>",$content, $view_url, $view_url);
                 $oMail = new Mail();
                 $oMail->setTitle($title);
                 $oMail->setContent($content);
diff --git a/modules/member/skins/cozy_simple/send_message.html b/modules/member/skins/cozy_simple/send_message.html
index a001cff0c..a455bffa6 100644
--- a/modules/member/skins/cozy_simple/send_message.html
+++ b/modules/member/skins/cozy_simple/send_message.html
@@ -24,6 +24,10 @@
                 <th scope="row">{$lang->title}</th>
                 <td><input type="text" name="title" id="message_title" class="inputTypeText w300" /></td>
             </tr>
+            <tr>
+                <th scope="row">{$lang->cmd_option}</th>
+                <td><input type="checkbox" value="Y" name="send_mail"  /> {$lang->cmd_send_mail}</td>
+            </tr>
             </table>
 
             <div class="editor">
diff --git a/modules/member/skins/default/send_message.html b/modules/member/skins/default/send_message.html
index fb77492e1..e45bf1ab9 100644
--- a/modules/member/skins/default/send_message.html
+++ b/modules/member/skins/default/send_message.html
@@ -24,6 +24,10 @@
                 <th scope="row">{$lang->title}</th>
                 <td><input type="text" name="title" id="message_title" class="inputTypeText w300" /></td>
             </tr>
+            <tr>
+                <th scope="row">{$lang->cmd_option}</th>
+                <td><input type="checkbox" value="Y" name="send_mail"  /> {$lang->cmd_send_mail}</td>
+            </tr>
             </table>
 
             <div class="editor">